]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
tweak
authorPeter van Dijk <peter.van.dijk@netherlabs.nl>
Mon, 29 Apr 2013 18:12:13 +0000 (20:12 +0200)
committerPeter van Dijk <peter.van.dijk@netherlabs.nl>
Mon, 29 Apr 2013 18:12:13 +0000 (20:12 +0200)
build-scripts/make-jenkins-version

index 4f50848a441de23a1bd9bb642744cb0b805b8101..248ba5dc299c5253ce01e2f591bf8b57f7147027 100755 (executable)
@@ -1,8 +1,9 @@
 #!/bin/sh
+GIT_BRANCH=$(echo ${GIT_BRANCH} | sed 's!^origin/!!')
 if [ $GIT_BRANCH = master ]
 then
        echo $(date +%Y%m%d).${BUILD_NUMBER}.$(git rev-parse --short $GIT_COMMIT)
 else
-       branch="$(echo ${GIT_BRANCH} | sed 's!^origin/!!' | tr ' /-' _)"
+       branch="$(echo ${GIT_BRANCH} | tr ' /-' _)"
        echo $(date +%Y%m%d).${branch}-${BUILD_NUMBER}.$(git rev-parse --short $GIT_COMMIT)
 fi