Merge branch '35-path-must-be-initialized-in-profile-shell' into 32-overlay-implementation

This commit is contained in:
2019-05-14 10:33:25 +02:00
4 changed files with 11 additions and 12 deletions
+2
View File
@@ -34,6 +34,8 @@ unset MODULE_VERSION
unset MODULE_VERSION_STACK
unset MODULESHOME
PATH="${PMODULES_HOME}/bin:$PATH"
#############################################################################
# implement module comand as shell function
#
+6 -6
View File
@@ -67,14 +67,14 @@ std::get_abspath() {
}
std::append_path () {
local -r P="$1"
local -r d="$2"
local -r P=$1
local -r d=$2
if ! echo ${!P} | egrep -q "(^|:)${d}($|:)" ; then
if [[ -z ${!P} ]]; then
eval $P=\"${d}\"
export "$P=${d}"
else
eval $P=\"${!P}:${d}\"
export "$P=${!P}:${d}"
fi
fi
}
@@ -85,9 +85,9 @@ std::prepend_path () {
if ! echo ${!P} | egrep -q "(^|:)${d}($|:)" ; then
if [[ -z ${!P} ]]; then
eval $P=${d}
export "$P=${d}"
else
eval $P=${d}:${!P}
export "$P=${d}:${!P}"
fi
fi
}
+3 -2
View File
@@ -1555,7 +1555,7 @@ subcommand_list() {
init_path() {
std::replace_path PATH "${PMODULES_HOME%/*}/.*"
std::append_path PATH "${PMODULES_HOME}/bin"
std::prepend_path PATH "${PMODULES_HOME}/bin"
}
init_manpath() {
@@ -1597,7 +1597,8 @@ pmodules_init() {
LOADEDMODULES \
_LMFILES_ \
MODULEPATH \
PATH
PATH \
MANPATH
}
##############################################################################
-4
View File
@@ -12,10 +12,6 @@
# set default version
: ${PMODULES_VERSION:=@PMODULES_VERSION@}
export PMODULES_DEFAULT_GROUPS
export PMODULES_DEFAULT_RELEASES
export PMODULES_VERSION
#############################################################################
# N O C H A N G E S B E L O W T H I S L I N E ! #
#