mirror of
https://github.com/Pmodules/Pmodules.git
synced 2026-06-29 02:39:39 +02:00
Merge branch '106-do-not-add-pmodules-bin-directory-to-path' into 'master'
Resolve "do not add Pmodules bin directory to PATH" Closes #106 See merge request Pmodules/src!74
This commit is contained in:
@@ -35,8 +35,6 @@ unset MODULE_VERSION_STACK
|
||||
unset MODULESHOME
|
||||
unset PMODULES_ENV
|
||||
|
||||
PATH="${PMODULES_HOME}/bin:$PATH"
|
||||
|
||||
#############################################################################
|
||||
# implement module comand as shell function
|
||||
#
|
||||
|
||||
@@ -47,4 +47,3 @@ if (! $?LOADEDMODULES ) then
|
||||
setenv LOADEDMODULES ""
|
||||
endif
|
||||
|
||||
setenv PATH "${PMODULES_HOME}/bin:${PATH}"
|
||||
|
||||
@@ -1315,10 +1315,6 @@ reset_used_releases() {
|
||||
g_env_must_be_saved='yes'
|
||||
}
|
||||
|
||||
init_path() {
|
||||
std::replace_path PATH "${PMODULES_HOME%/*}/.*"
|
||||
std::prepend_path PATH "${PMODULES_HOME}/bin"
|
||||
}
|
||||
|
||||
init_manpath() {
|
||||
std::replace_path MANPATH "${PMODULES_HOME%/*}/.*"
|
||||
@@ -1350,13 +1346,11 @@ pmodules_init() {
|
||||
reset_modulepath
|
||||
reset_used_groups
|
||||
reset_used_releases
|
||||
init_path
|
||||
init_manpath
|
||||
export_env \
|
||||
LOADEDMODULES \
|
||||
_LMFILES_ \
|
||||
MODULEPATH \
|
||||
PATH \
|
||||
MANPATH
|
||||
}
|
||||
|
||||
|
||||
@@ -89,10 +89,6 @@ unset PMODULES_DEFAULT_RELEASES
|
||||
unset PMODULES_DEFAULT_GROUPS
|
||||
unset PMODULES_DEFINED_RELEASES
|
||||
|
||||
# setup PATH
|
||||
dirs_to_remove="${PMODULES_HOME%/*}/*"
|
||||
path=( ${(m)path:#${dirs_to_remove}} "${PMODULES_HOME}/bin" )
|
||||
|
||||
# initialize MANPATH with output of `man --path` if not set
|
||||
[[ -z "${MANPATH}" ]] && manpath=$( man --path )
|
||||
|
||||
|
||||
Reference in New Issue
Block a user