mx/MX_Pmodule
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lib/libem.bash: bugfix in building dependencies; remove source directory in em.cleanup_src()

Browse Source
This commit is contained in:
gsell
2014-04-28 09:05:01 +02:00
parent d87afe6b9f
commit c960e2d7ff
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/libem.bash
+6 -2
View File
@@ -1,5 +1,7 @@
#!/bin/bash #!/bin/bash
declare -rx ARGS="$@"
declare -rx SHLIBDIR=$( cd $(dirname "$BASH_SOURCE") && pwd ) declare -rx SHLIBDIR=$( cd $(dirname "$BASH_SOURCE") && pwd )
declare -r OS=$(uname -s) declare -r OS=$(uname -s)
@@ -184,8 +186,8 @@ function _load_build_dependencies() {
fi fi
if module load "$m" 2>&1 | grep -q "Unable to locate"; then if module load "$m" 2>&1 | grep -q "Unable to locate"; then
echo "Module \"$m\" not available, trying to build it..." echo "Module \"$m\" not available, trying to build it..."
"${SCRIPTDIR}/${m/\/*}" "${SCRIPTDIR}/${m/\/*}.build" ${ARGS[@]}
if -z $(module avail "$m" 2>&1); then if [[ -z $(module avail "$m" 2>&1) ]]; then
echo "Oops: Building module \"$m\" failed..." echo "Oops: Building module \"$m\" failed..."
exit 1 exit 1
fi fi
@@ -390,6 +392,8 @@ function em.cleanup_src() {
if [[ $(pwd) != / ]]; then if [[ $(pwd) != / ]]; then
echo "Cleaning up $(pwd)" echo "Cleaning up $(pwd)"
rm -rf * rm -rf *
cd ..
rmdir "/${EM_SRCDIR}"
fi fi
); );
} }