From: Bill Erickson <berickxx@gmail.com>
Date: Thu, 21 May 2015 17:47:43 +0000 (-0400)
Subject: eg-brick-manager attach prompt on -attach actions
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=0f20d76c9a5e43895fb0e40f905f9fee1c2dbe2e;p=working%2FEvergreen.git

eg-brick-manager attach prompt on -attach actions

Instead of forcing an attach when -g is present, only apply -g when an
explicit attach option (roll-attach, start-attach) is selected.

Signed-off-by: Bill Erickson <berickxx@gmail.com>
---

diff --git a/KCLS/admin-scripts/eg-brick-manager.sh b/KCLS/admin-scripts/eg-brick-manager.sh
index d73647fc38..73e7516dfa 100755
--- a/KCLS/admin-scripts/eg-brick-manager.sh
+++ b/KCLS/admin-scripts/eg-brick-manager.sh
@@ -123,13 +123,21 @@ function inspect_args {
         if [ "$ACTION" = "roll" ]; then
             EG_UPDATER_OPS="-o"
         elif [ "$ACTION" = "roll-attach" ]; then
-            EG_UPDATER_OPS="-o -a"
+            if [ -n "$PROMPT_ATTACH" ]; then
+                EG_UPDATER_OPS="-og"
+            else
+                EG_UPDATER_OPS="-oa"
+            fi;
         elif [ "$ACTION" = "stop" ]; then
             EG_UPDATER_OPS="-l"
         elif [ "$ACTION" = "start" ]; then
             EG_UPDATER_OPS="-m"
         elif [ "$ACTION" = "start-attach" ]; then
-            EG_UPDATER_OPS="-ma"
+            if [ -n "$PROMPT_ATTACH" ]; then
+                EG_UPDATER_OPS="-mg"
+            else
+                EG_UPDATER_OPS="-ma"
+            fi;
         elif [ "$ACTION" = "detach" ]; then
             EG_UPDATER_OPS="-u"
         elif [ "$ACTION" = "attach" ]; then
@@ -137,10 +145,6 @@ function inspect_args {
         fi
     fi
 
-    if [ -n "$PROMPT_ATTACH" ]; then
-        EG_UPDATER_OPS="$EG_UPDATER_OPS -g"
-    fi
-
     if  [ -z "$LIST_SERVERS" -a -z "$EG_UPDATER_OPS" ]; then
         usage;
     fi