From df50ec313bfe394d8d89d7a6625fd22aab0709bc Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Thu, 9 Jul 2015 17:44:08 +0200
Subject: [PATCH] scripts/Bootstrap/{compile,install}_pmodules.sh: - bugfix in
 setting PMODULES_VERSION

---
 scripts/Bootstrap/compile_pmodules.sh | 5 +++--
 scripts/Bootstrap/install_pmodules.sh | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/scripts/Bootstrap/compile_pmodules.sh b/scripts/Bootstrap/compile_pmodules.sh
index 7b5ff11..7fb50c8 100755
--- a/scripts/Bootstrap/compile_pmodules.sh
+++ b/scripts/Bootstrap/compile_pmodules.sh
@@ -5,9 +5,10 @@ declare -r BOOTSTRAP_DIR="${BASE_DIR}/scripts/Bootstrap"
 
 source "${BASE_DIR}/lib/lib.bash"
 
-read_versions "${BOOTSTRAP_DIR}/Pmodules_version.conf"
-
 unset PMODULES_HOME
+unset PMODULES_VERSION
+
+read_versions "${BOOTSTRAP_DIR}/Pmodules_version.conf"
 source "/opt/psi/config/environment.bash"
 
 #if [[ -n ${PMODULES_DIR} ]] && [[ "${PMODULES_DIR}" != "/" ]] && [[ -d "${PMODULES_DIR}" ]]; then
diff --git a/scripts/Bootstrap/install_pmodules.sh b/scripts/Bootstrap/install_pmodules.sh
index 83a6b9b..b4c0c6a 100755
--- a/scripts/Bootstrap/install_pmodules.sh
+++ b/scripts/Bootstrap/install_pmodules.sh
@@ -6,9 +6,10 @@ declare -r SRC_DIR="${BOOTSTRAP_DIR}/Pmodules"
 
 source "${BASE_DIR}/lib/lib.bash"
 
-read_versions "${BOOTSTRAP_DIR}/Pmodules_version.conf"
-
 unset PMODULES_HOME
+unset PMODULES_VERSION
+
+read_versions "${BOOTSTRAP_DIR}/Pmodules_version.conf"
 source "/opt/psi/config/environment.bash"
 
 echo "Installing to ${PMODULES_HOME} ..."