From a95d546371afa4892ca51841527a6cda4907402c Mon Sep 17 00:00:00 2001
From: Thomas Roeblitz <thomas.roblitz@uib.no>
Date: Tue, 15 Oct 2024 15:09:32 +0200
Subject: [PATCH] revert variable expansion and unset certain variables instead

---
 EESSI-install-software.sh        | 4 +++-
 init/eessi_environment_variables | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/EESSI-install-software.sh b/EESSI-install-software.sh
index 84c96ad369..467a484fc7 100755
--- a/EESSI-install-software.sh
+++ b/EESSI-install-software.sh
@@ -173,7 +173,9 @@ fi
 # Set all the EESSI environment variables (respecting $EESSI_SOFTWARE_SUBDIR_OVERRIDE)
 # $EESSI_SILENT - don't print any messages
 # $EESSI_BASIC_ENV - give a basic set of environment variables
-EESSI_SILENT= EESSI_BASIC_ENV= source $TOPDIR/init/eessi_environment_variables
+unset EESSI_SILENT
+unset EESSI_BASIC_ENV
+source $TOPDIR/init/eessi_environment_variables
 
 if [[ -z ${EESSI_SOFTWARE_SUBDIR} ]]; then
     fatal_error "Failed to determine software subdirectory?!"
diff --git a/init/eessi_environment_variables b/init/eessi_environment_variables
index 125f3e5a93..60d69cc198 100644
--- a/init/eessi_environment_variables
+++ b/init/eessi_environment_variables
@@ -10,7 +10,7 @@ function error() {
 function show_msg {
   # only echo msg if EESSI_SILENT is unset
   msg=$1
-  if [[ -z ${EESSI_SILENT:+x} ]]; then
+  if [[ -z ${EESSI_SILENT+x} ]]; then
     echo "$msg"
   fi
 }