From: Lucas Di Pentima <lucas.dipentima@curii.com>
Date: Mon, 26 Jun 2023 15:47:54 +0000 (-0300)
Subject: 20665: Code style improvements.
X-Git-Tag: 2.7.0~68^2~2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/36f5a68fd76e60f2cfdd0cf584d1d2de005e19ec

20665: Code style improvements.

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima@curii.com>
---

diff --git a/tools/salt-install/installer.sh b/tools/salt-install/installer.sh
index 55cbd36d94..b042d1a835 100755
--- a/tools/salt-install/installer.sh
+++ b/tools/salt-install/installer.sh
@@ -127,7 +127,7 @@ deploynode() {
 }
 
 loadconfig() {
-    if [ ! -s ${CONFIG_FILE} -o ! -s ${CONFIG_FILE}.secrets ]; then
+    if [[ -s ${CONFIG_FILE} && -s ${CONFIG_FILE}.secrets ]]; then
 		echo "Must be run from initialized setup dir, maybe you need to 'initialize' first?"
     fi
     source ${CONFIG_FILE}.secrets
diff --git a/tools/salt-install/provision.sh b/tools/salt-install/provision.sh
index e438dfa775..3314d04ff8 100755
--- a/tools/salt-install/provision.sh
+++ b/tools/salt-install/provision.sh
@@ -241,7 +241,7 @@ arguments ${@}
 
 declare -A NODES
 
-if [ -s ${CONFIG_FILE} -a -s ${CONFIG_FILE}.secrets ]; then
+if [[ -s ${CONFIG_FILE} && -s ${CONFIG_FILE}.secrets ]]; then
   source ${CONFIG_FILE}.secrets
   source ${CONFIG_FILE}
 else