From c5b2c92dfdd074bbd087804ec588a99fb2890f2d Mon Sep 17 00:00:00 2001 From: Weidong Shao Date: Thu, 7 Aug 2014 09:34:05 +0000 Subject: [PATCH] Use dev/experimental branch for compass-adapters repo Change-Id: I1e4c07a5e72fd6c0ef88e90088ce1a157d1590a6 --- install/prepare.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/install/prepare.sh b/install/prepare.sh index 1c125d18..a176f3f0 100755 --- a/install/prepare.sh +++ b/install/prepare.sh @@ -6,6 +6,11 @@ copy2dir() repo=$1 destdir=$2 git_branch=master + + if [ -n "$4" ]; then + git_branch=$4 + fi + if [[ "$repo" =~ (git|http|https|ftp):// ]]; then if [[ -d $destdir || -L $destdir ]]; then cd $destdir @@ -190,7 +195,7 @@ if [[ "$?" != "0" ]]; then echo "mysqld is not started" exit 1 else - echo "mysqld conf is updated" + echo "mysqld conf is updated" fi cd $SCRIPT_DIR @@ -204,7 +209,7 @@ if [ -z $ADAPTERS_SOURCE ]; then echo "adpaters source $ADAPTERS_SOURCE is not set" exit 1 fi -copy2dir "$ADAPTERS_SOURCE" "$ADAPTERS_HOME" "stackforge/compass-adapters" || exit $? +copy2dir "$ADAPTERS_SOURCE" "$ADAPTERS_HOME" "stackforge/compass-adapters" dev/experimental || exit $? if [ "$tempest" == "true" ]; then if [[ ! -e /tmp/tempest ]]; then