X-Git-Url: https://git.tld-linux.org/?p=packages%2Frpm-build-tools.git;a=blobdiff_plain;f=kde4send2builders.sh;h=801f86de8f93b1ab9fde9d536ce6ea7ceabbc7cb;hp=02561c636fef7fa0b9469b000a5e6f6936d3d493;hb=3e9a7bf0474933245b19c717f7180bde09eb387b;hpb=d1bb439ca25aa0f30fa94d0437eed5c51df40c70 diff --git a/kde4send2builders.sh b/kde4send2builders.sh index 02561c6..801f86d 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,8 +124,8 @@ while [ $# -gt 0 ]; do shift ;; - --skip-pull | -s ) - SKIPPULL=1 + --skip-fetch-tags | -s ) + SKIPFETCHTAGS=1 ;; --help | -h ) @@ -187,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 --tags >/dev/null && git tag |tail -n 1) else LAST_AUTOTAG=$(cd $PKG && git tag |tail -n 1) fi