Simplify code in tag_files as TAGVER and TAG are mutually exclusive

[packages/rpm-build-tools.git] / builder.sh

diff --git a/builder.sh b/builder.sh
index 718da3296dd323e2bb1dd81013b863402bba33ab..900bd6a6362631bee4965faf9b27e3d8c423ec92 100755 (executable)
--- a/builder.sh
+++ b/builder.sh
@@ -1366,29 +1366,22 @@ tag_files() {
        echo "Version: $PACKAGE_VERSION"
        echo "Release: $PACKAGE_RELEASE"
 
-       local TAGVER
+       local _tag
        if [ "$TAG_VERSION" = "yes" ]; then
-               TAGVER=`make_tagver`
-               echo "tag: $TAGVER"
+               _tag=`make_tagver`
        fi
        if [ -n "$TAG" ]; then
-               echo "tag: $TAG"
+               _tag="$TAG"
        fi
+       echo "tag: $_tag"
 
        local OPTIONS="tag $CVS_FORCE"
 
        cd "$PACKAGE_DIR"
 
-       if [ "$TAG_VERSION" = "yes" ]; then
-               update_shell_title "tag sources: $TAGVER"
-               git $OPTIONS $TAGVER || exit
-               git push $CVS_FORCE $REMOTE_PLD tag $TAGVER || Exit_error err_remote_problem $REMOTE_PLD
-       fi
-       if [ -n "$TAG" ]; then
-               update_shell_title "tag sources: $TAG"
-               git $OPTIONS $TAG || exit
-               git push $CVS_FORCE $REMOTE_PLD tag $TAG || Exit_error err_remote_problem $REMOTE_PLD
-       fi
+       update_shell_title "tag sources: $_tag"
+       git $OPTIONS $_tag || exit
+       git push $CVS_FORCE $REMOTE_PLD tag $_tag || Exit_error err_remote_problem $REMOTE_PLD
 }
 
 branch_files() {