From 1099444ea311a20da46c24af592126db75ce1c30 Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Fri, 2 Dec 2022 18:22:15 +0100
Subject: [PATCH] modulecmd is now relocatable

---
 Pmodules/modulecmd.bash.in | 1 +
 Pmodules/modulecmd.in      | 2 +-
 build                      | 3 +++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Pmodules/modulecmd.bash.in b/Pmodules/modulecmd.bash.in
index 63e5f82..af6af5b 100644
--- a/Pmodules/modulecmd.bash.in
+++ b/Pmodules/modulecmd.bash.in
@@ -29,6 +29,7 @@ else
 	declare -rx TCLLIBPATH="${PMODULES_HOME}/lib/Pmodules"
 	declare -r  modulecmd="${libexecdir}/modulecmd.bin"
 fi
+declare -rx TCL_LIBRARY="${PMODULES_HOME}/lib/tcl@TCL_VERSION@"
 
 declare verbosity_lvl=${PMODULES_VERBOSITY:-'verbose'}
 
diff --git a/Pmodules/modulecmd.in b/Pmodules/modulecmd.in
index bce0367..02a5b41 100644
--- a/Pmodules/modulecmd.in
+++ b/Pmodules/modulecmd.in
@@ -2,4 +2,4 @@
 
 unset BASH_ENV
 
-"@BASH@" --noprofile --norc "@MODULECMD@" "$@"
+"${PMODULES_HOME}/libexec/bash" --noprofile --norc "${PMODULES_HOME}/libexec/modulecmd.bash" "$@"
diff --git a/build b/build
index 560b7c8..9487bf2 100755
--- a/build
+++ b/build
@@ -5,6 +5,8 @@ if [ "${BASH_VERSINFO[0]}" -lt 4 ]; then
 	exit 1
 fi
 
+declare TCL_VERSION='8.6'
+
 declare -r OS=$(uname -s)
 
 declare	BOOTSTRAP_DIR=$(dirname "$0")
@@ -467,6 +469,7 @@ pmodules::install() {
 	sed_cmd+="s:@BASH@:${PMODULES_HOME}/${UTILBIN_DIR}/bash:g;"
 	sed_cmd+="s:@MODULECMD@:${PMODULES_HOME}/${UTILBIN_DIR}/modulecmd.bash:g;"
 	sed_cmd+="s:@MODMANAGE@:${PMODULES_HOME}/${UTILBIN_DIR}/modmanage.bash:g;"
+	sed_cmd+="s:@TCL_VERSION@:${TCL_VERSION}:g;"
 	
 	sed "${sed_cmd}" "${SRC_DIR}/profile.bash.in"     > "${PMODULES_ROOT}/${CONFIG_DIR}/profile.bash-${PMODULES_VERSION}"
 	sed "${sed_cmd}" "${SRC_DIR}/profile.csh.in"      > "${PMODULES_ROOT}/${CONFIG_DIR}/profile.csh-${PMODULES_VERSION}"