From d491c3046ed3c9d7e42cc469b7e1467f3cb63856 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 22 Mar 2017 15:07:46 +0100 Subject: [PATCH] Pmodules/modulecmd.bash.in - libmodules.tcl moved to $PMODULES_HOME/lib/Pmodules - revert removing PSI_LIBMODULES, there are still some old modulefiles - bugfix in sub-command 'purge' fixing issue #10 --- Pmodules/modulecmd.bash.in | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Pmodules/modulecmd.bash.in b/Pmodules/modulecmd.bash.in index c403a76..3ccd025 100755 --- a/Pmodules/modulecmd.bash.in +++ b/Pmodules/modulecmd.bash.in @@ -28,13 +28,12 @@ declare -r version='@PMODULES_VERSION@' if [[ ${PMODULES_PURETCL} == yes ]]; then declare -r modulecmd="${libexecdir}/modulecmd.tcl" else + declare -rx TCLLIBPATH="${PMODULES_HOME}/lib/Pmodules" declare -r modulecmd="${libexecdir}/modulecmd.bin" fi -declare -rx TCL_LIBRARY="${libdir}/tcl8.6" - # required for pre 0.99.3 modulefiles -declare -rx PSI_LIBMODULES="${TCL_LIBRARY}/libmodules.tcl" +declare -rx PSI_LIBMODULES="${TCLLIBPATH}/libmodules.tcl" declare verbosity_lvl=${PMODULES_VERBOSITY:-'verbose'} @@ -1413,6 +1412,14 @@ subcommand_refresh() { # subcommand_purge() { subcommand_generic0 purge "$@" + PMODULES_USED_GROUPS='' + MODULEPATH='' + + for group in ${PMODULES_DEFAULT_GROUPS}; do + std::append_path MODULEPATH "${PMODULES_ROOT}/${group}/${PMODULES_MODULEFILES_DIR}" + std::append_path PMODULES_USED_GROUPS "${group}" + done + pbuild::export_env ${g_shell} MODULEPATH PMODULES_USED_GROUPS } ##############################################################################