adding latest updates for EG release building

diff --git a/build-eg/build_eg_point_release.sh b/build-eg/build_eg_point_release.sh
index e8c79cc..09a3c73 100755 (executable)
--- a/build-eg/build_eg_point_release.sh
+++ b/build-eg/build_eg_point_release.sh
@@ -29,10 +29,14 @@ fi
 WORKDIR="$PWD"
 TRANSLATION_USER="bshum"
 TRANSLATION_EXPORT="translation-export-$(echo $EG_VERSION | cut -b 1-3)"
-VERSION_STRING="$(echo $EG_VERSION | perl -e 'while (<>) {@c = split /\./, $_; print "$c[0].0$c[1]0$c[2]";}')"
+VERSION_STRING="$(echo $EG_VERSION | perl -e 'while (<>) {@c = split /\./, $_; if (length($c[2] == 2)) {print "$c[0].0$c[1]0$c[2]";} else {print "$c[0].0$c[1]$c[2]";}}')"
 OSRF_GIT="osrf_rel_$(echo $OSRF_VERSION | sed 's/\./_/g')"
 PREV_EG_VERSION=$(echo $EG_VERSION | perl -e 'while (<>) {@c = split /\./, $_; print "$c[0].$c[1]." . ("$c[2]" - 1)}')
 UPGRADE_DOC="docs/installation/server_upgrade.adoc"
+WEBSERVER_USER="user"
+WEBSERVER="www.example.org"
+SSH_PORT="22"
+EDITOR="vim"
 
 # clone OpenSRF
 CloneOpenSRF () {
@@ -41,7 +45,7 @@ if [ ! -d OpenSRF ]; then
 else
     echo "OpenSRF directory already exists. Skipping"
 fi
-cd OpenSRF && git checkout -b $OSRF_GIT $OSRF_GIT
+cd OpenSRF && git fetch && git checkout -b $OSRF_GIT $OSRF_GIT
 cd $WORKDIR
 }
 
@@ -71,6 +75,7 @@ cd $WORKDIR
 CreateBranch () {
 cd $WORKDIR/Evergreen
 git checkout rel_$(echo $EG_VERSION | cut -b 1-3 | sed 's/\./_/g')
+git pull
 git checkout -b rel_$(echo $EG_VERSION | sed 's/\./_/g')
 cd $WORKDIR
 }
@@ -104,6 +109,7 @@ cd $WORKDIR
 # substitute old EG version number with new EG version number in the upgrade doc
 UpdateUpgradeDoc () {
 cd Evergreen
+git checkout origin/tags/rel_$(echo $PREV_EG_VERSION | sed 's/\./_/g') docs/installation/server_upgrade.adoc
 sed -i "s/rel_$(echo $PREV_EG_VERSION | sed 's/\./_/g')/rel_$(echo $EG_VERSION | sed 's/\./_/g')/g" $UPGRADE_DOC
 sed -i "s/Evergreen $PREV_EG_VERSION/Evergreen $EG_VERSION/g" $UPGRADE_DOC
 sed -i "s/Evergreen-ILS-$PREV_EG_VERSION/Evergreen-ILS-$EG_VERSION/g" $UPGRADE_DOC
@@ -111,6 +117,9 @@ sed -i "s/to $PREV_EG_VERSION/to $EG_VERSION/g" $UPGRADE_DOC
 sed -i "/-$PREV_EG_VERSION-upgrade-db.sql/a - $PREV_EG_VERSION-$EG_VERSION-upgrade-db.sql" $UPGRADE_DOC
 sed -i "/^-.*-$PREV_EG_VERSION-upgrade-db.sql/a - $PREV_EG_VERSION-$EG_VERSION-upgrade-db.sql" $UPGRADE_DOC
 sed -i "s^version-upgrade/.*-$PREV_EG_VERSION-upgrade-db.sql^version-upgrade/$PREV_EG_VERSION-$EG_VERSION-upgrade-db.sql^g" $UPGRADE_DOC
+echo "Please verify make any manual corrections you need to $UPGRADE_DOC"
+sleep 3
+$EDITOR $UPGRADE_DOC
 git commit -asm "Updating upgrade docs for $EG_VERSION."
 cd $WORKDIR
 }
@@ -139,7 +148,16 @@ cd $WORKDIR
 # push the changes to git server
 PushBranch () {
 cd Evergreen
-git push working rel_$(echo $EG_VERSION | sed 's/\./_/g'):user/$GIT_USERNAME/rel_$(echo $EG_VERSION | sed 's/\./_/g')
+git push --force working rel_$(echo $EG_VERSION | sed 's/\./_/g'):user/$GIT_USERNAME/rel_$(echo $EG_VERSION | sed 's/\./_/g')
+cd $WORKDIR
+}
+
+CompressReleaseDir () {
+tar czvf $WORKDIR/release-${EG_VERSION}.tar.gz release
+}
+
+CopyReleaseToWebServer () {
+scp -P $SSH_PORT $WORKDIR/release-${EG_VERSION}.tar.gz $WEBSERVER_USER@$WEBSERVER:~/public_html
 }
 
 # do stuff
@@ -153,3 +171,5 @@ UpdateUpgradeDoc
 MakeRelease
 ReleaseDocs
 PushBranch
+CompressReleaseDir
+CopyReleaseToWebServer