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

libem.bash: with new BASH we have to re-init the module environment; bugfix in _set_link()

Browse Source
This commit is contained in:
gsell
2014-10-09 13:56:44 +02:00
parent 3de7360f79
commit d44ad20765
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/libem.bash
View File

@@ -2,6 +2,11 @@
PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/opt/X11/bin PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/opt/X11/bin
shopt -s expand_aliases
source "${PSI_PREFIX}/${PSI_CONFIG_DIR}/profile.bash"
module use unstable
declare -r MODULECMD="${MODULESHOME}/bin/modulecmd" declare -r MODULECMD="${MODULESHOME}/bin/modulecmd"
declare -r BUILDSCRIPT=$( cd $(dirname "$0") && pwd )/$(basename "$0") declare -r BUILDSCRIPT=$( cd $(dirname "$0") && pwd )/$(basename "$0")
@@ -503,12 +508,13 @@ function em.install_doc() {
} }
function _set_link() { function _set_link() {
[[ ${cur_module_release} == ${MODULE_RELEASE} ]] && return 0
local _path local _path
if [[ "${cur_module_release}" != '' ]]; then if [[ "${cur_module_release}" != '' ]]; then
_path="${PSI_PREFIX}/${PSI_MODULES_ROOT}/${MODULE_FAMILY}${cur_module_release/.stable}/${MODULE_NAME}" _path="${PSI_PREFIX}/${PSI_MODULES_ROOT}/${MODULE_FAMILY}${cur_module_release/.stable}/${MODULE_NAME}"
info "Removing old sym-link \"${_path}\" ..." if [[ -e "${_path}" ]]; then
rm "${_path}" info "Removing old sym-link \"${_path}\" ..."
rm "${_path}"
fi
fi fi
( (
_path="${PSI_PREFIX}/${PSI_MODULES_ROOT}/${MODULE_FAMILY}${MODULE_RELEASE/.stable}/${MODULE_NAME%/*}" _path="${PSI_PREFIX}/${PSI_MODULES_ROOT}/${MODULE_FAMILY}${MODULE_RELEASE/.stable}/${MODULE_NAME%/*}"