From a9b6185facf12f8cc37df92911e68c97d6d62a9b Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Sat, 21 Jun 2014 19:10:17 +0100
Subject: [PATCH] Fix SC2015 - Note that A && B || C is not if-then-else. C may
 run when A is true

---
 bootstrap-salt.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 41d33d2..b5548c5 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -4054,7 +4054,7 @@ config_salt() {
 
     # Let's create the necessary directories
     [ -d "$_SALT_ETC_DIR" ] || mkdir "$_SALT_ETC_DIR" || return 1
-    [ -d "$_PKI_DIR" ] || mkdir -p "$_PKI_DIR" && chmod 700 "$_PKI_DIR" || return 1
+    [ -d "$_PKI_DIR" ] || (mkdir -p "$_PKI_DIR" && chmod 700 "$_PKI_DIR") || return 1
 
     # Copy the grains file if found
     if [ -f "$_TEMP_CONFIG_DIR/grains" ]; then
@@ -4065,7 +4065,7 @@ config_salt() {
 
     if [ "$_INSTALL_MINION" -eq $BS_TRUE ]; then
         # Create the PKI directory
-        [ -d "$_PKI_DIR/minion" ] || mkdir -p "$_PKI_DIR/minion" && chmod 700 "$_PKI_DIR/minion" || return 1
+        [ -d "$_PKI_DIR/minion" ] || (mkdir -p "$_PKI_DIR/minion" && chmod 700 "$_PKI_DIR/minion") || return 1
 
         # Copy the minions configuration if found
         if [ -f "$_TEMP_CONFIG_DIR/minion" ]; then
@@ -4136,7 +4136,7 @@ preseed_master() {
     fi
 
     SEED_DEST="$_PKI_DIR/master/minions"
-    [ -d "$SEED_DEST" ] || mkdir -p "$SEED_DEST" && chmod 700 "$SEED_DEST" || return 1
+    [ -d "$SEED_DEST" ] || (mkdir -p "$SEED_DEST" && chmod 700 "$SEED_DEST") || return 1
 
     for keyfile in $_TEMP_KEYS_DIR/*; do
         keyfile=$(basename "${keyfile}")