summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2012-03-05 15:43:28 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2012-03-05 15:43:28 +0100
commitcbc7c6158cc2fc646398214c3f1cdc2814709a31 (patch)
tree456caf12e08f639632c1bc1a234b2febbd9a565f
parentdbb4c63c0f687b769a5a4e0d81777ec8a401c794 (diff)
downloadbin-cbc7c6158cc2fc646398214c3f1cdc2814709a31.zip
bin-cbc7c6158cc2fc646398214c3f1cdc2814709a31.tar.gz
easy_e17.sh: add --branch option
-rwxr-xr-xeasy_e17.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/easy_e17.sh b/easy_e17.sh
index b105ce3..ebf1baf 100755
--- a/easy_e17.sh
+++ b/easy_e17.sh
@@ -32,6 +32,7 @@ ewk_build_dir="./WebKitBuild/Release"
git=0
git_url="git@asynk.ch:e"
+git_branch="master"
src_url="http://svn.enlightenment.org/svn/e/trunk"
src_rev="HEAD"
cmd_svn_test="svn info"
@@ -134,7 +135,7 @@ function header ()
echo
echo " efl e +"
if [ $git -eq 1 ]; then
- echo " Source url : $git_url"
+ echo " Source url : $git_url ($git_branch)"
else
echo " Source url : $src_url (Revision: $src_rev)"
fi
@@ -189,6 +190,7 @@ function help ()
echo " --instpath=<path> = change the default install path"
echo " --srcpath=<path> = change the default source path"
echo " --srcurl=<url> = change the default source url"
+ echo " --branch=<branch> = change the default git branch"
echo " --srcmode=<packages/full> = checkout only required package source"
echo " or simply everthing (huge)"
echo " --srcrev=<revision> = set the default source revision"
@@ -813,6 +815,7 @@ function git_fetch ()
set_title "Updating sources in '$src_path' ..."
echo "- updating sources in '$src_path' ..."
cd $src_path
+ git checkout $git_branch || exit 1
if [ $make_only == 0 ]; then
echo "- checkout modified files"
git status -s | grep -e '^ M' | cut -d " " -f 3 | xargs git checkout 2>/dev/null