Skip to content

E
etersoft-build-utils
Commit 0c8c01af authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

rpmbs: add -T for just tag set

parent f6d2c8ab
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 4 deletions
bin/rpmbs
View file @ 0c8c01af
#!/bin/bash #!/bin/bash
# (c) Etersoft 2003-2012, 2017 # (c) Etersoft 2003-2012, 2017, 2018
# Author: Vitaly Lipatov <lav@etersoft.ru>, 2012, 2017 # Author: Vitaly Lipatov <lav@etersoft.ru>, 2012, 2017, 2018
# Public domain # Public domain
# #
# BS - build source # BS - build source
...@@ -22,6 +22,7 @@ load_mod rpm tarball alt git web buildsrpm branch ...@@ -22,6 +22,7 @@ load_mod rpm tarball alt git web buildsrpm branch
SIGN= SIGN=
SIGNTAG= SIGNTAG=
TAG=
FORCE= FORCE=
UPLOADNOW= UPLOADNOW=
CHECKONLY= CHECKONLY=
...@@ -64,17 +65,19 @@ phelp() ...@@ -64,17 +65,19 @@ phelp()
echog " -f force operation (overwrite tag)" echog " -f force operation (overwrite tag)"
echog " -s sign package(s) (and move it to dir ETERDESTSRPM if defined)" echog " -s sign package(s) (and move it to dir ETERDESTSRPM if defined)"
echog " -t set tag with sign" echog " -t set tag with sign"
echog " -T set tag"
echog " -n do not check with sisyphus_check before upload" echog " -n do not check with sisyphus_check before upload"
echog " -o create nosrc.rpm package" echog " -o create nosrc.rpm package"
echog " -z create src.rpm with compatible gzip compression (obsoleted)" echog " -z create src.rpm with compatible gzip compression (obsoleted)"
# echog " -d - remove package(s) from SRPMS and Incoming" # echog " -d - remove package(s) from SRPMS and Incoming"
} }
while getopts :hfstcudenop:a:Ab:z opt; do while getopts :hfstTcudenop:a:Ab:z opt; do
case $opt in case $opt in
h) phelp; exit 0;; h) phelp; exit 0;;
s) SIGN=1 ;; s) SIGN=1 ;;
t) SIGNTAG=1 ;; t) SIGNTAG=1 ;;
T) TAG=1 ;;
e) TESTONLY="--test-only" ; UPLOADNOW=1 ; SIGN=1 ;; e) TESTONLY="--test-only" ; UPLOADNOW=1 ; SIGN=1 ;;
f) FORCE="-f" ;; f) FORCE="-f" ;;
# FIXME: handle SIGN separately # FIXME: handle SIGN separately
...@@ -112,8 +115,16 @@ __gear_create_tag() ...@@ -112,8 +115,16 @@ __gear_create_tag()
local GEARCTAG=gear-create-tag local GEARCTAG=gear-create-tag
if [ "$1" = "pipe" ] ; then if [ "$1" = "pipe" ] ; then
shift shift
if [ -n "$TAG" ] ; then
a= git tag $FORCE "$VERSION-$RELEASE" -m "$BASENAME $VERSION-$RELEASE" "$@" 2>&1
return
fi
$GEARCTAG $FORCE -n "$VERSION-$RELEASE" -m "$BASENAME $VERSION-$RELEASE" "$@" 2>&1 $GEARCTAG $FORCE -n "$VERSION-$RELEASE" -m "$BASENAME $VERSION-$RELEASE" "$@" 2>&1
else else
if [ -n "$TAG" ] ; then
docmd git tag $FORCE "$VERSION-$RELEASE" -m "$BASENAME $VERSION-$RELEASE" "$@"
return
fi
docmd $GEARCTAG $FORCE -n "$VERSION-$RELEASE" -m "$BASENAME $VERSION-$RELEASE" "$@" docmd $GEARCTAG $FORCE -n "$VERSION-$RELEASE" -m "$BASENAME $VERSION-$RELEASE" "$@"
fi fi
} }
...@@ -232,7 +243,7 @@ CURDIR=`pwd` ...@@ -232,7 +243,7 @@ CURDIR=`pwd`
# see functions/alt:set_binaryrepo() for BINARYREPONAME # see functions/alt:set_binaryrepo() for BINARYREPONAME
set_binaryrepo $MENV set_binaryrepo $MENV
if [ -n "$SIGNTAG" ] ; then if [ -n "$SIGNTAG$TAG" ] ; then
for ln in $LISTNAMES ; do for ln in $LISTNAMES ; do
if set_usebranch ; then if set_usebranch ; then
checkout_usebranch || fatal checkout_usebranch || fatal
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment