fixes, and cleanup vbuild*
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Thu, 23 Apr 2015 09:17:45 +0000 (11:17 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Thu, 23 Apr 2015 09:17:45 +0000 (11:17 +0200)
scripts/lbuild-nightly.sh [changed from symlink to file mode: 0755]
scripts/vbuild-nightly.sh [deleted file]

deleted file mode 120000 (symlink)
index a5e1df5c8b4bd1321420c5a71cf7ada2a20db4ea..0000000000000000000000000000000000000000
+++ /dev/null
@@ -1 +0,0 @@
-vbuild-nightly.sh
\ No newline at end of file
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..16740b21343c5d874b7f77d8654b6fab3fc86626
--- /dev/null
@@ -0,0 +1,27 @@
+#!/bin/bash
+COMMAND=$(basename $0)
+BUILD_SCM_URL="git://git.onelab.eu/build"
+
+# scan args for any -s option, and set BUILD_SCM_URL in this case
+function scan_build_scm_url () {
+    while [[ -n "$@" ]] ; do
+       if [ "$1" == "-s" ] ; then
+           BUILD_SCM_URL="$2"
+       fi
+       shift
+    done
+
+    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 "$@"
+
+tmpd=/tmp/git-$$
+tmpc=$tmpd/$COMMAND
+mkdir $tmpd
+git archive --remote=$GIT_REPO $GIT_TAG $COMMAND | tar -C $tmpd -xf -
+chmod +x $tmpc
+$tmpc "$@"
+rm -rf $tmpd
diff --git a/scripts/vbuild-nightly.sh b/scripts/vbuild-nightly.sh
deleted file mode 100755 (executable)
index 92f5639..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-COMMAND=$(basename $0)
-BUILD_SCM_URL="git://git.onelab.eu/build"
-
-# scan args for any -s option, and set BUILD_SCM_URL in this case
-function scan_build_scm_url () {
-    while [[ -n "$@" ]] ; do
-       if [ "$1" == "-s" ] ; then
-           BUILD_SCM_URL="$2"
-       fi
-       shift
-    done
-
-    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 "$@"
-
-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