From 42929f835ffb975a96dcf8b643fc42ea89912b5c Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 3 Aug 2022 15:57:20 +0200 Subject: [PATCH] modulecmd: support for modulecmd written in Tcl removed --- Pmodules/modulecmd.bash.in | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/Pmodules/modulecmd.bash.in b/Pmodules/modulecmd.bash.in index 0c25562..58d35fc 100644 --- a/Pmodules/modulecmd.bash.in +++ b/Pmodules/modulecmd.bash.in @@ -32,16 +32,12 @@ std::def_cmds "${path}" \ 'awk' 'base64' 'find' 'getopt' 'logger' 'mktemp' \ 'rm' 'sort' 'yq' -if [[ ${PMODULES_PURETCL} == yes ]]; then - declare -r modulecmd="${libexecdir}/modulecmd.tcl" +if [[ -n ${TCLLIBPATH} ]]; then + declare -x TCLLIBPATH="${PMODULES_HOME}/lib/Pmodules:${TCLLIBPATH}" else - if [[ -n ${TCLLIBPATH} ]]; then - declare -x TCLLIBPATH="${PMODULES_HOME}/lib/Pmodules:${TCLLIBPATH}" - else - declare -x TCLLIBPATH="${PMODULES_HOME}/lib/Pmodules" - fi - declare -r modulecmd="${libexecdir}/modulecmd.bin" + declare -x TCLLIBPATH="${PMODULES_HOME}/lib/Pmodules" fi +declare -r modulecmd="${libexecdir}/modulecmd.bin" declare verbosity_lvl=${PMODULES_VERBOSITY:-'verbose'}