more robust for parallel runs

[infrastructure.git] / scripts / vbuild-nightly.sh

diff --git a/scripts/vbuild-nightly.sh b/scripts/vbuild-nightly.sh
index 014ec19..92f5639 100755 (executable)
--- a/scripts/vbuild-nightly.sh
+++ b/scripts/vbuild-nightly.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 COMMAND=$(basename $0)
 BUILD_SCM_URL="git://git.onelab.eu/build"
-USE_GIT=""
 
 # scan args for any -s option, and set BUILD_SCM_URL in this case
 function scan_build_scm_url () {
@@ -12,25 +11,17 @@ function scan_build_scm_url () {
        shift
     done
 
-    # is this a git url ?
-    if echo $BUILD_SCM_URL | grep -q git ; then USE_GIT="true" ; fi
-
-    if [ -n "$USE_GIT" ] ; then
-       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
+    GIT_REPO=$(echo $BUILD_SCM_URL | cut -d@ -f1)
+    GIT_TAG=$(echo $BUILD_SCM_URL | cut -s -d@ -f2)
+    GIT_TAG=${GIT_TAG:-master}
 }
 
 scan_build_scm_url "$@"
 
-tmp=/tmp/$COMMAND-$$
-if [ -n "$USE_GIT" ] ; then
-    git archive --remote=$GIT_REPO $GIT_TAG $COMMAND | tar -C /tmp -xf -
-    mv /tmp/$COMMAND $tmp
-else
-    svn cat $BUILD_SCM_URL/$COMMAND  > $tmp
-fi
-chmod +x $tmp
-$tmp "$@"
-rm $tmp
+tmpd=/tmp/git-$$
+tmpc=$tpmd/$COMMAND
+mkdir $tmpd
+git archive --remote=$GIT_REPO $GIT_TAG $COMMAND | tar -C $tmpd -xf -
+chmod +x $tmc
+$tmpc "$@"
+rm -rf $tmpd