mirror of
https://github.com/Pmodules/Pmodules.git
synced 2026-06-27 01:53:08 +02:00
Merge branch '35-path-must-be-initialized-in-profile-shell' into 32-overlay-implementation
This commit is contained in:
@@ -34,6 +34,8 @@ unset MODULE_VERSION
|
||||
unset MODULE_VERSION_STACK
|
||||
unset MODULESHOME
|
||||
|
||||
PATH="${PMODULES_HOME}/bin:$PATH"
|
||||
|
||||
#############################################################################
|
||||
# implement module comand as shell function
|
||||
#
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
##############################################################################
|
||||
|
||||
@@ -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 ! #
|
||||
#
|
||||
|
||||
Reference in New Issue
Block a user