commit 3833d614f29c2a926c076e652b56fdb1ec90db27
author Eric Gwin <eric.gwin@oracle.com> Wed Jan 30 14:15:42 2013 -0500
committer Eric Gwin <eric.gwin@oracle.com> Wed Jan 30 14:15:42 2013 -0500
tree 01f592b582ed7693403dc8246135a17d8f6e0bab
parent 9293808ae78cb639cc912ce85ee4a2a68df6f363

fix git refresh to detect "master" branch

publish.sh

diff --git a/publish.sh b/publish.sh
index bbf787a..1b8e086 100755
--- a/publish.sh
+++ b/publish.sh
@@ -44,6 +44,7 @@
 #Global Variables
 PUB_SCOPE_EXPECTED=0
 PUB_SCOPE_COMPLETED=0
+MASTER_BRANCH_VERSION=2.5
 
 PATH=${JAVA_HOME}/bin:${ANT_HOME}/bin:/usr/bin:/usr/local/bin:${PATH}
 
@@ -78,6 +79,7 @@
     done
 }
 
+unset checkoutCurrentBranch
 checkoutCurrentBranch() {
     local_repo=$1
     desired_branch=$2
@@ -533,7 +535,11 @@
         fi
 
         # Ensure Latest branch specific upload scripts available
-        checkoutCurrentBranch ${RUNTIME_REPO} ${branch}
+        if [ "${MASTER_BRANCH_VERSION}" = "${branch}" ] ; then
+            checkoutCurrentBranch ${RUNTIME_REPO} master
+        else
+            checkoutCurrentBranch ${RUNTIME_REPO} ${branch}
+        fi
 
         #Invoke Antscript for Maven upload
         arguments="-Dbuild.deps.dir=${BldDepsDir} -Dcustom.tasks.lib=${RELENG_REPO}/ant_customizations.jar -Dversion.string=${version}.${qualifier}"