install-eg.sh: Update to latest 2.12 branch (and simplify a few variables)
authortwirlip <twirlip@twirlip.org>
Thu, 23 Mar 2017 20:00:33 +0000 (13:00 -0700)
committertwirlip <twirlip@twirlip.org>
Thu, 23 Mar 2017 20:00:33 +0000 (13:00 -0700)
deployment/install-eg.sh

index 7b29ac1..7a664af 100755 (executable)
@@ -3,18 +3,16 @@
 
 HOSTNAME="nonprod"
 DEFAULT_USER="sitkastaff"
-DEFAULT_USER_HOMEDIR="/home/${DEFAULT_USER}"
 INSTALL_USER="opensrf"
-INSTALL_USER_HOMEDIR="/home/${INSTALL_USER}"
 #EGRELEASE="Evergreen-ILS-2.12.beta"
-#BUILDDIR="${INSTALL_USER_HOMEDIR}/${EGRELEASE}"
-BUILDDIR="${INSTALL_USER_HOMEDIR}/evergreen"
+#BUILDDIR="/home/${INSTALL_USER}/${EGRELEASE}"
+BUILDDIR="/home/${INSTALL_USER}/evergreen"
 INSTALLDIR="/srv/openils"
-BRANCH="user/jeffdavis/upgrade_2_12_beta_tpac"
-STAMP_ID="rel_2_12_beta"
-ALT_STAMP_IDS="2_12_beta"
-VERSION="2.12.beta.sitka.0"
-SITKACONF="${DEFAULT_USER_HOMEDIR}/sysadmin"
+BRANCH="user/jeffdavis/upgrade_2_12_tpac"
+STAMP_ID="rel_2_12_0"
+ALT_STAMP_IDS="2_12_0 rel_2_12_beta 2_12_beta"
+VERSION="2.12.0.sitka.0"
+SITKACONF="/home/${DEFAULT_USER}/sysadmin"
 SITKACONF_BRANCH="eg212"
 SITKATOOLS="/root/sitka-tools"
 
@@ -46,20 +44,20 @@ fi
 if [ ! -d "${SITKACONF}" ]
 then
   # this will fail unless DEFAULT_USER has read access to the repo
-  suwrap "cd ${DEFAULT_USER_HOMEDIR} && git clone git+ssh://git@git.sitka.bclibraries.ca/sitka-infra/sysadmin" ${DEFAULT_USER}
+  suwrap "cd /home/${DEFAULT_USER} && git clone git+ssh://git@git.sitka.bclibraries.ca/sitka-infra/sysadmin" ${DEFAULT_USER}
 fi
 suwrap "cd ${SITKACONF} && git fetch origin && git checkout ${SITKACONF_BRANCH} && git pull" ${DEFAULT_USER}
 
 # checkout EG source
 if [ ! -d "${BUILDDIR}" ]
 then
-  suwrap "cd ${INSTALL_USER_HOMEDIR} && git clone git://git.sitka.bclibraries.ca/sitka/evergreen evergreen" ${INSTALL_USER}
+  suwrap "cd /home/${INSTALL_USER} && git clone git://git.sitka.bclibraries.ca/sitka/evergreen evergreen" ${INSTALL_USER}
 fi
 suwrap "cd ${BUILDDIR} && git fetch origin && git checkout ${BRANCH} && git pull" ${INSTALL_USER}
 
 # download and unpack EG release
 #rm -rf ${BUILDDIR}
-#suwrap "cd ${INSTALL_USER_HOMEDIR} && wget http://open-ils.org/downloads/${EGRELEASE}.tar.gz && tar xzf ${EGRELEASE}.tar.gz" ${INSTALL_USER}
+#suwrap "cd /home/${INSTALL_USER} && wget http://open-ils.org/downloads/${EGRELEASE}.tar.gz && tar xzf ${EGRELEASE}.tar.gz" ${INSTALL_USER}
  
 # as root
 cd ${BUILDDIR} && make -f Open-ILS/src/extras/Makefile.install ubuntu-trusty