Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRuben Rodriguez <ruben@activitycentral.com>2012-09-11 12:17:53 (GMT)
committer Ruben Rodriguez <ruben@activitycentral.com>2012-09-11 12:17:53 (GMT)
commit1a547d51db460bd0b7138a3860b6fdc8a0fc893c (patch)
treedf1648a7b92cef82007cdda4577fee4273750f5b
parent8b6e80cc3177b4dde8d744fa08f8185e35854353 (diff)
Added git branch management to buildall.sh
-rw-r--r--rpms/buildall.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/rpms/buildall.sh b/rpms/buildall.sh
index 5ae585c..f0723b3 100644
--- a/rpms/buildall.sh
+++ b/rpms/buildall.sh
@@ -19,6 +19,7 @@
# Builds all Dextrose-patched Sugar RPMs and puts them in ~/repo
arch |grep -q arm && ARCH=armv5tel || ARCH=i686
+BRANCH=$( git branch|grep '*' |cut -c3- )
mkdir ~/repo/specs ~/repo/$ARCH/os ~/repo/$ARCH/debug ~/repo/source ~/repo/buildlogs -p
@@ -44,5 +45,5 @@ createrepo ~/repo/$ARCH/os
createrepo ~/repo/source
createrepo ~/repo/$ARCH/debug
-[ $ARCH = "i686" ] && rsync -va ~/repo/* quidam@shell.sugarlabs.org:dextrose-repo/v3/
-[ $ARCH = "armv5tel" ] && rsync -va ~/repo/armv5tel repo/buildlogs quidam@shell.sugarlabs.org:dextrose-repo/v3/
+[ $ARCH = "i686" ] && rsync -va ~/repo//* quidam@shell.sugarlabs.org:dextrose-repo/v3/$BRANCH/
+[ $ARCH = "armv5tel" ] && rsync -va ~/repo/armv5tel repo/buildlogs quidam@shell.sugarlabs.org:dextrose-repo/v3/$BRANCH/