From: Bill Erickson <berickxx@gmail.com>
Date: Wed, 25 Mar 2015 15:01:05 +0000 (-0700)
Subject: eg-updater typo; remove unneeded staff bulid vars
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=a421730ecdb88a2a1ff5758e87569bf1110194b1;p=working%2FEvergreen.git

eg-updater typo; remove unneeded staff bulid vars

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 4dbc79ad34..4d8a3a99bd 100755
--- a/KCLS/admin-scripts/eg-updater.sh
+++ b/KCLS/admin-scripts/eg-updater.sh
@@ -377,13 +377,16 @@ function recover_opensrf_file_ownership {
     # This approach ensures all non-NFS shares are modified and runs quickly.
     set +e # chown returns non-zero on various failures we can ignore
 
-    fstype=$(stat --file-system -c %T /openils/var/data/offline)
+    fstype=""
+    if [ -d /openils/var/data/offline ]; then
+    	fstype=$(stat --file-system -c %T /openils/var/data/offline)
+    fi
 
     if [ "$fstype" != "nfs" ]; then
         # if the offline directory is not an NFS share, assume this
         # server has no NFS shares under /openils.
         announce "Assuming no NFS shares present"
-        sudo chown -R opensrf:opensf /openils 2> /dev/null
+        sudo chown -R opensrf:opensrf /openils 2> /dev/null
         return
     fi
 
@@ -454,9 +457,7 @@ function deploy_code {
     # Put client server files under the build-id specific directory
     # so we can track each build individually.  A symlink from the
     # series (if set) to the latest build is set later.
-    sudo make STAFF_CLIENT_STAMP_ID="$CLIENT_BUILD_ID" \
-        STAFF_CLIENT_BUILD_ID="$CLIENT_BUILD_ID" \
-        STAFF_CLIENT_VERSION="$CLIENT_BUILD_ID" install > /dev/null
+    sudo make STAFF_CLIENT_STAMP_ID="$CLIENT_BUILD_ID" install > /dev/null
     
     # recover ownership of repo files after sudo/install
     sudo chown -R $OWNER:$OWNER $EVERGREEN_BASE