From f2927ab4a2c586749542336d3a0d6b2e30cd4fb6 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Thu, 23 Apr 2015 11:17:45 +0200 Subject: [PATCH] fixes, and cleanup vbuild* --- scripts/lbuild-nightly.sh | 28 +++++++++++++++++++++++++++- scripts/vbuild-nightly.sh | 27 --------------------------- 2 files changed, 27 insertions(+), 28 deletions(-) mode change 120000 => 100755 scripts/lbuild-nightly.sh delete mode 100755 scripts/vbuild-nightly.sh diff --git a/scripts/lbuild-nightly.sh b/scripts/lbuild-nightly.sh deleted file mode 120000 index a5e1df5..0000000 --- a/scripts/lbuild-nightly.sh +++ /dev/null @@ -1 +0,0 @@ -vbuild-nightly.sh \ No newline at end of file diff --git a/scripts/lbuild-nightly.sh b/scripts/lbuild-nightly.sh new file mode 100755 index 0000000..16740b2 --- /dev/null +++ b/scripts/lbuild-nightly.sh @@ -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 index 92f5639..0000000 --- a/scripts/vbuild-nightly.sh +++ /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 -- 2.43.0