From ee2fc203fd1b089cc7ddfb33d460eb356bdc1a00 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Tue, 5 May 2015 16:27:18 -0400 Subject: [PATCH] eg-updater use series ID for builds stamp When building a client installer, be sure the builds/current-client-build.zip (and related files) use the same 'build' directory as the installer. This ensures the build series (stamp) ID matches the installer series (stamp) ID. Signed-off-by: Bill Erickson --- KCLS/admin-scripts/eg-updater.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/KCLS/admin-scripts/eg-updater.sh b/KCLS/admin-scripts/eg-updater.sh index c3a732860b..74a33fec10 100755 --- a/KCLS/admin-scripts/eg-updater.sh +++ b/KCLS/admin-scripts/eg-updater.sh @@ -302,9 +302,16 @@ function deploy_web { # from an Evergreen brick. # ----------------------------------------------------------------------- function publish_staff_client_build { - cd $EVERGREEN_BASE; - $OSRF mkdir -p $XUL_DIR/builds/ + + # build the staff client first, so we can get a build + # directory whose stamp ID matches the series but whose + # version matches the build ID. + if [ -n "$BUILD_XUL" ]; then + build_staff_client; + fi + + cd $EVERGREEN_BASE; $OSRF cp -r Open-ILS/xul/staff_client/build $XUL_DIR/builds/ cd $XUL_DIR @@ -329,9 +336,6 @@ function publish_staff_client_build { $OSRF ln -s $CLIENT_BUILD_ID.zip current-client-build.zip $OSRF rm -r build # don't need the extracted version on the server - if [ -n "$BUILD_XUL" ]; then - build_staff_client; - fi } function build_staff_client { -- 2.11.0