From: Peter Amstutz <peter.amstutz@curii.com>
Date: Thu, 30 Jun 2022 17:21:26 +0000 (-0400)
Subject: 18870: Handle possibly undefined command line parameters
X-Git-Tag: 2.5.0~127^2~1
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/9ae866579b9e62ac11817b8053aaae74be7ea1cf?ds=sidebyside

18870: Handle possibly undefined command line parameters

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>
---

diff --git a/tools/salt-install/installer.sh b/tools/salt-install/installer.sh
index 238efe8684..35a194af4e 100755
--- a/tools/salt-install/installer.sh
+++ b/tools/salt-install/installer.sh
@@ -116,9 +116,11 @@ case "$subcmd" in
 	    exit
 	fi
 
+	set +u
 	SETUPDIR=$1
 	PARAMS=$2
 	SLS=$3
+	set -u
 
 	err=
 	if [[ -z "$PARAMS" || ! -f local.params.example.$PARAMS ]] ; then
@@ -156,7 +158,9 @@ case "$subcmd" in
 	echo "setup directory initialized, now go to $SETUPDIR, edit '${CONFIG_FILE}' and '${CONFIG_DIR}' as needed, then run 'installer.sh deploy'"
 	;;
     deploy)
+	set +u
 	NODE=$1
+	set -u
 
 	loadconfig
 
@@ -218,7 +222,9 @@ case "$subcmd" in
     diagnostics)
 	loadconfig
 
+	set +u
 	declare LOCATION=$1
+	set -u
 
 	if ! which arvados-client ; then
 	    echo "arvados-client not found, install 'arvados-client' package with 'apt-get' or 'yum'"