From: thierry <thierry@41d37cc5-eb28-0410-a9bf-d37491348ade>
Date: Fri, 21 May 2010 21:24:28 +0000 (+0000)
Subject: permissions
X-Git-Tag: foo~148
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b4fff6e9ee95bdea4ca422bd94e3a652003d5288;p=infrastructure.git

permissions
---

diff --git a/scripts/vbuild-nightly.sh b/scripts/vbuild-nightly.sh
index 36b1fe6..512e331 100755
--- a/scripts/vbuild-nightly.sh
+++ b/scripts/vbuild-nightly.sh
@@ -14,12 +14,12 @@ function scan_build_scm_url () {
     done
 
     # is this a git url ?
-    echo $BUILD_SCM_URL | grep -q git && USE_GIT="true"
+    if echo $BUILD_SCM_URL | grep -q git ; then USE_GIT="true" ; fi
 
     if [ -n "$USE_GIT" ] ; then
-	GITREPO=$(echo $BUILD_SCM_URL | cut -d@ -f1)
-	GITTAG=$(echo $BUILD_SCM_URL | cut -s -d@ -f2)
-	GITTAG=${GITTAG:-master}
+	GIT_REPO=$(echo $BUILD_SCM_URL | cut -d@ -f1)
+	GIT_TAG=$(echo $BUILD_SCM_URL | cut -s -d@ -f2)
+	GIT_TAG=${GIT_TAG:-master}
     fi
 }
 
@@ -27,7 +27,7 @@ scan_build_scm_url "$@"
 
 tmp=/tmp/$COMMAND-$$
 if [ -n "$USE_GIT" ] ; then
-    git archive --remote=$GITREPO $GITTAG $COMMAND | tar -C /tmp -xf -
+    git archive --remote=$GIT_REPO $GIT_TAG $COMMAND | tar -C /tmp -xf -
     mv /tmp/$COMMAND $tmp
 else
     svn cat $BUILD_SCM_URL/$COMMAND  > $tmp