[svn-commits] dsessions: testsuite/bamboo/trunk r1242 - /bamboo/trunk/bin/

[SVN commits to the Digium repositories]

Author: dsessions
Date: Fri Dec 17 09:04:43 2010
New Revision: 1242

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=1242
Log:
first rev of the gitall fix with the scf build scripts

Modified:
    bamboo/trunk/bin/build-asterisk-scf.sh

Modified: bamboo/trunk/bin/build-asterisk-scf.sh
URL: http://svnview.digium.com/svn/testsuite/bamboo/trunk/bin/build-asterisk-scf.sh?view=diff&rev=1242&r1=1241&r2=1242
==============================================================================
--- bamboo/trunk/bin/build-asterisk-scf.sh (original)
+++ bamboo/trunk/bin/build-asterisk-scf.sh Fri Dec 17 09:04:43 2010
@@ -6,13 +6,18 @@
 COMPONENT_REV=`cat .git/refs/heads/master`
 COMPONENT_NAM=$@
 
-# Bamboo will have only cloned the gitall repo itself, so we
-# need to clone the other repos.
-
 git clone git://git.asterisk.org/asterisk-scf/integration/gitall
 cd gitall
 
 ./gitall-asterisk-scf.sh
+
+
+if [[ "$COMPONENT_NAM" == "gitall" ]]
+then
+	CLONED_REV = `cat .git/refs/heads/master`
+else
+	CLONED_REV = `cat $COMPONENT_NAM/.git/refs/heads/master`
+fi
 
 echo ""
 echo ""
@@ -20,13 +25,16 @@
 echo ""
 echo "-----------------"
 echo "Bamboo revision = $COMPONENT_REV"
-echo "Cloned revision = `cat $COMPONENT_NAM/.git/refs/heads/master`"
+echo "Cloned revision = $CLONED_REV"
 echo "-----------------"
 
-if [[ "$COMPONENT_REV" != "`cat $COMPONENT_NAM/.git/refs/heads/master`" ]]
+if [[ "$COMPONENT_REV" != "$CLONED_REV" ]]
 then
 	echo "Reverting to $COMPONENT_REV"
-	cd $COMPONENT_NAM
+	if [[ "$COMPONENT_NAM" != "gitall" ]]
+	then
+		cd $COMPONENT_NAM
+	fi
 	git checkout $COMPONENT_REV
 	cd ..
 fi