revert variable expansion and unset certain variables instead

trz42 · Oct 15, 2024 · a95d546 · a95d546
1 parent 7b8ba8b
commit a95d546
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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
 }