diff options
| -rwxr-xr-x | share/spack/qa/setup-env-test.sh | 3 | ||||
| -rwxr-xr-x | share/spack/setup-env.sh | 12 |
2 files changed, 11 insertions, 4 deletions
diff --git a/share/spack/qa/setup-env-test.sh b/share/spack/qa/setup-env-test.sh index b75d006e75..f572166b05 100755 --- a/share/spack/qa/setup-env-test.sh +++ b/share/spack/qa/setup-env-test.sh @@ -163,6 +163,9 @@ unuse() { # Make sure no environment is active unset SPACK_ENV +# fail with undefined variables +set -u + # Source setup-env.sh before tests . share/spack/setup-env.sh diff --git a/share/spack/setup-env.sh b/share/spack/setup-env.sh index c5bd32882d..e0161f21a2 100755 --- a/share/spack/setup-env.sh +++ b/share/spack/setup-env.sh @@ -46,9 +46,12 @@ spack() { emulate -L sh fi - # accumulate initial flags for main spack command + # accumulate flags meant for the main spack command + # the loop condition is unreadable, but it means: + # while $1 is set (while there are arguments) + # and $1 starts with '-' (and the arguments are flags) _sp_flags="" - while [ "${1#-}" != "${1}" ]; do + while [ ! -z ${1+x} ] && [ "${1#-}" != "${1}" ]; do _sp_flags="$_sp_flags $1" shift done @@ -62,8 +65,9 @@ spack() { return fi + # set the subcommand if there is one (if $1 is set) _sp_subcommand="" - if [ -n "$1" ]; then + if [ ! -z ${1+x} ]; then _sp_subcommand="$1" shift fi @@ -102,7 +106,7 @@ spack() { case $_sp_arg in activate) _a="$@" - if [ -z "$1" ] || \ + if [ -z ${1+x} ] || \ [ "${_a#*--sh}" != "$_a" ] || \ [ "${_a#*--csh}" != "$_a" ] || \ [ "${_a#*-h}" != "$_a" ]; |