From 0689b04259a8ff2ce0033c1509b2972c34b65b7d Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Fri, 12 Mar 2021 11:51:49 +0100 Subject: [PATCH 1/2] do not add the Pmodules bin directory to PATH --- Pmodules/bash | 2 -- Pmodules/csh | 1 - Pmodules/zsh | 4 ---- 3 files changed, 7 deletions(-) diff --git a/Pmodules/bash b/Pmodules/bash index fa5da29..c7e9bf5 100644 --- a/Pmodules/bash +++ b/Pmodules/bash @@ -35,8 +35,6 @@ unset MODULE_VERSION_STACK unset MODULESHOME unset PMODULES_ENV -PATH="${PMODULES_HOME}/bin:$PATH" - ############################################################################# # implement module comand as shell function # diff --git a/Pmodules/csh b/Pmodules/csh index be69b42..854152a 100644 --- a/Pmodules/csh +++ b/Pmodules/csh @@ -47,4 +47,3 @@ if (! $?LOADEDMODULES ) then setenv LOADEDMODULES "" endif -setenv PATH "${PMODULES_HOME}/bin:${PATH}" diff --git a/Pmodules/zsh b/Pmodules/zsh index fc46c4d..80dc338 100644 --- a/Pmodules/zsh +++ b/Pmodules/zsh @@ -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 ) From 0007d5dc38a470da49b1056e0d88c997eb8c1ef1 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Fri, 12 Mar 2021 13:39:41 +0100 Subject: [PATCH 2/2] Do not add Pmodule bin dir to PATH in initialisation --- Pmodules/modulecmd.bash.in | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Pmodules/modulecmd.bash.in b/Pmodules/modulecmd.bash.in index b1bd0bd..c7e6b8e 100755 --- a/Pmodules/modulecmd.bash.in +++ b/Pmodules/modulecmd.bash.in @@ -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 }