From c091a93164f0e16b3d484c1f0474d0e230c1471e Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Mon, 5 Dec 2022 17:05:30 +0100 Subject: [PATCH 1/2] Tcl implementation of modulecmd removed --- build | 3 --- 1 file changed, 3 deletions(-) diff --git a/build b/build index 99f8959..7291eb4 100755 --- a/build +++ b/build @@ -456,9 +456,6 @@ build::install() { sed "${sed_cmd}" "${SRC_DIR}/modulecmd.bash.in" \ > "${PREFIX}/libexec/modulecmd.bash" chmod 0755 "${PREFIX}/libexec/modulecmd.bash" - sed "${sed_cmd}" "${SRC_DIR}/modulecmd.tcl.in" \ - > "${PREFIX}/libexec/modulecmd.tcl" - chmod 0755 "${PREFIX}/libexec/modulecmd.tcl" sed "${sed_cmd}" "${SRC_DIR}/libpmodules.bash.in" \ > "${PREFIX}/lib/libpmodules.bash" From 020ed5943b9da71d045ae67e3e717530b1ef5c20 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Mon, 5 Dec 2022 17:06:41 +0100 Subject: [PATCH 2/2] Tcl library paths fixed --- Pmodules/modulecmd.bash.in | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Pmodules/modulecmd.bash.in b/Pmodules/modulecmd.bash.in index b35fa96..f5658df 100644 --- a/Pmodules/modulecmd.bash.in +++ b/Pmodules/modulecmd.bash.in @@ -32,11 +32,10 @@ std::def_cmds "${path}" \ 'awk' 'base64' 'find' 'getopt' 'logger' 'mktemp' \ 'rm' 'sed' 'sort' 'yq' -if [[ -n ${TCLLIBPATH} ]]; then - declare -x TCLLIBPATH="${PMODULES_HOME}/lib/Pmodules:${TCLLIBPATH}" -else - declare -x TCLLIBPATH="${PMODULES_HOME}/lib/Pmodules" -fi +declare -rx TCL_LIBRARY="${PMODULES_HOME}/lib/tcl@TCL_VERSION@" +declare -x TCLLIBPATH +std::prepend_path TCLLIBPATH "${PMODULES_HOME}/lib/Pmodules" + declare -r modulecmd="${libexecdir}/modulecmd.bin" declare -- verbosity_lvl=${PMODULES_VERBOSITY:-'verbose'}