X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=kde4send2builders.sh;h=5a42d931524967aab752adddeef46e7ef97dadb7;hb=d5f0f2d2b8d209224ed235f914506c5f52fc2e48;hp=eb4f78f11cf5d6b1275750cfc6e58f331614a1a3;hpb=d149169bd80f434657a6a13d2104ac3d879ed095;p=packages%2Frpm-build-tools.git diff --git a/kde4send2builders.sh b/kde4send2builders.sh index eb4f78f..5a42d93 100755 --- a/kde4send2builders.sh +++ b/kde4send2builders.sh @@ -16,8 +16,8 @@ usage() { echo " -b --builder VALUE" echo " choose a particular builder, default all" echo " -p --priority VALUE (default: 2)" - echo " -s --skip-pull (default: no)" - echo " skip git pull when getting autotag" + echo " -s --skip-fetch-tags (default: no)" + echo " skip git fetch --tags when getting autotag" echo " -h --help" echo " show this help" echo "" @@ -40,7 +40,7 @@ ATAG=no SENDPRIO= BUILDER= PRIO=2 -SKIPPULL=0 +SKIPFETCHTAGS=0 #SPECDIR=$(rpm -E %_specdir) SPECDIR=~/rpm @@ -124,9 +124,8 @@ while [ $# -gt 0 ]; do shift ;; - --skip-pull | -s ) - SKIPPULL=1 - shift + --skip-fetch-tags | -s ) + SKIPFETCHTAGS=1 ;; --help | -h ) @@ -188,8 +187,8 @@ if [ "$ATAG" == "yes" ]; then if [ ! -d $PKG ]; then git clone git@git.tld-linux.org:packages/${PKG} fi - if [ $SKIPPULL -lt 1 ]; then - LAST_AUTOTAG=$(cd $PKG && git pull >/dev/null && git tag |tail -n 1) + if [ $SKIPFETCHTAGS -lt 1 ]; then + LAST_AUTOTAG=$(cd $PKG && git fetch -q --tags && git tag |tail -n 1) else LAST_AUTOTAG=$(cd $PKG && git tag |tail -n 1) fi