From 1e112f5c44b712f741527d459d78123114aeed61 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Thu, 9 Jan 2014 15:47:43 +0100 Subject: [PATCH] =?utf8?q?drop=20support=20for=20svn=20url=E2=80=99s=20for?= =?utf8?q?=20retrieving=20build?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- scripts/vbuild-nightly.sh | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/scripts/vbuild-nightly.sh b/scripts/vbuild-nightly.sh index 014ec19..10c72a5 100755 --- 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,16 @@ 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 +git archive --remote=$GIT_REPO $GIT_TAG $COMMAND | tar -C /tmp -xf - +mv /tmp/$COMMAND $tmp chmod +x $tmp $tmp "$@" rm $tmp -- 2.47.0