Tweak tests and remove unneeded code

Co-authored-by: ocaisa <alan.ocais@cecam.org>

Author: ocaisa

.github/workflows/scripts/test_init_scripts.sh

@@ -150,9 +150,11 @@ for shell in ${SHELLS[@]}; do
         pattern="{EESSI/${EESSI_VERSION}} "
         assert_raises 'echo "$TEST_EESSI_PS1_UPDATE" | grep "$pattern"'
         assert_raises 'echo "$TEST_EESSI_NO_PS1_UPDATE" | grep "$pattern"' 1
+        # Also check when we explicitly ask for it not to be updated
         TEST_EESSI_EXPLICIT_NO_PS1_UPDATE=$($shell -c "unset PS1 ; PS1='test> ' ; export EESSI_MODULE_UPDATE_PS1=0 ; . init/lmod/$shell 2>/dev/null ; echo \"\$PS1\"")
-        pattern='test> '
+        TEST_EESSI_EXPLICIT_NO_PS1_UPDATE_CALLED_TWICE=$($shell -c "unset PS1 ; PS1='$ ' ; export EESSI_MODULE_UPDATE_PS1=0 ; . init/lmod/$shell 2>/dev/null ; . init/lmod/$shell 2>/dev/null ; echo \"\$PS1\"")
         assert_raises 'echo "$TEST_EESSI_EXPLICIT_NO_PS1_UPDATE" | grep "$pattern"' 1
+        assert_raises 'echo "$TEST_EESSI_EXPLICIT_NO_PS1_UPDATE_CALLED_TWICE" | grep "$pattern"' 1
     fi
 
     # End Test Suite

init/lmod/sh

@@ -98,8 +98,7 @@ if [ -z "$__Init_EESSI_Default_Modules" ]; then
     # (in an interactive shell PS1 is likely unset, so let's only do this if it is set)
     if [ -n "$PS1" ]; then
         export PS1
-        if [ -n "${__Init_EESSI_MODULE_UPDATE_PS1+x}" ] || [ $((EESSI_MODULE_UPDATE_PS1)) -eq 0 ]; then
-            export __Init_EESSI_MODULE_UPDATE_PS1=0
+        if [ "${EESSI_MODULE_UPDATE_PS1-}" = "0" ] ; then
             unset EESSI_MODULE_UPDATE_PS1
         else
             export EESSI_MODULE_UPDATE_PS1=1