From: Bill Erickson <berickxx@gmail.com>
Date: Fri, 31 Jul 2015 15:49:41 +0000 (-0400)
Subject: eg-updater requires build-staff to build staff client
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=9ef3dd8fcf310dceb482e905b412d54db3738ab3;p=working%2FEvergreen.git

eg-updater requires build-staff to build staff client

And repair action name error build-eg-staff -> build-staff

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

diff --git a/KCLS/admin-scripts/eg-updater.sh b/KCLS/admin-scripts/eg-updater.sh
index ca11098f45..1dfd4b621f 100755
--- a/KCLS/admin-scripts/eg-updater.sh
+++ b/KCLS/admin-scripts/eg-updater.sh
@@ -63,12 +63,12 @@ function usage {
                 update-eg
                 deploy-eg
                 update-web
-                build-eg-staff
+                build-staff
                 start-eg
                 start-apache
                 attach
                 stop-all (detach,stop-apache,stop-eg) 
-                deploy-all (update-eg,deploy-eg,build-eg-staff)
+                deploy-all (update-eg,deploy-eg)
                 start-all (start-eg,start-apache)
             
             -p 
@@ -173,7 +173,7 @@ function inspect_params {
     fi
 
     if [[ "$ACTIONS" =~ "deploy-all" ]]; then
-        ACTIONS="$ACTIONS,update-eg,deploy-eg,build-eg-staff";
+        ACTIONS="$ACTIONS,update-eg,deploy-eg";
     fi
 
     if [[ "$ACTIONS" =~ "start-all" ]]; then
@@ -548,7 +548,11 @@ if [[ "$ACTIONS" =~ "update-web" ]]; then
 fi
 
 if [[ "$ACTIONS" =~ "build-staff" ]]; then
-    build_staff_client
+    if ! [[ "$ACTIONS" =~ "deploy-eg" ]]; then
+        # if deploy-eg is set, the staff client is built
+        # during the deploy step.
+        build_staff_client
+    fi
 fi
 
 if [[ "$ACTIONS" =~ "start-eg" ]]; then