From 85b4eca2375ac467dc37e991fe769b00af5f077e Mon Sep 17 00:00:00 2001
From: Micke Nordin <kano@sunet.se>
Date: Tue, 15 Oct 2024 09:49:06 +0200
Subject: [PATCH] Fix bumptag

---
 bump-tag | 54 +++++++++++++++++++++++++++---------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/bump-tag b/bump-tag
index dbcaa61..75e5c2f 100755
--- a/bump-tag
+++ b/bump-tag
@@ -13,41 +13,41 @@ else
 fi
 tagpfx=${tag:="${deftag}"}
 
-# last_tag=$(git tag -l "${tagpfx}-*" | sort | tail -1)
+last_tag=$(git tag -l "${tagpfx}-*" | sort | tail -1)
 
-# echo "Verifying last tag ${last_tag}:"
-# (git tag -v "${last_tag}" | grep ^gpg:) || true
-# # again to not mask exit status of git with grep
-# git tag -v "${last_tag}" >/dev/null 2>&1
-# echo ""
+echo "Verifying last tag ${last_tag}:"
+(git tag -v "${last_tag}" | grep ^gpg:) || true
+# again to not mask exit status of git with grep
+git tag -v "${last_tag}" >/dev/null 2>&1
+echo ""
 
-# echo "Differences between tag ${last_tag} and what you are about to sign:"
-# env PAGER=cat git diff --color "${last_tag}..main"
+echo "Differences between tag ${last_tag} and what you are about to sign:"
+env PAGER=cat git diff --color "${last_tag}..main"
 
 iter=1
-# ok=
-# while test -z "$ok"; do
+ok=
+while test -z "$ok"; do
 	this_tag=$(date "+${tagpfx}-%Y-%m-%d-v$(printf "%02d" ${iter})")
-#   iter=$(( iter + 1))
-# 	case $( (
-# 		echo "${this_tag}"
-# 		echo "${last_tag}"
-# 	) | sort | tail -1) in
-# 	"${last_tag}") ;;
+  iter=$(( iter + 1))
+	case $( (
+		echo "${this_tag}"
+		echo "${last_tag}"
+	) | sort | tail -1) in
+	"${last_tag}") ;;
 
-# 	"${this_tag}")
-# 		ok=yes
-# 		;;
-# 	esac
-# done
+	"${this_tag}")
+		ok=yes
+		;;
+	esac
+done
 
-# if [ "${deftag}" != "${tagpfx}" ]; then
-# 	echo -e "Using new tag \e[94m${this_tag}\e[0m according to pattern in cosmos.conf"
-# else
-# 	echo -e "Using new tag \e[94m${this_tag}\e[0m"
-# fi
+if [ "${deftag}" != "${tagpfx}" ]; then
+	echo -e "Using new tag \e[94m${this_tag}\e[0m according to pattern in cosmos.conf"
+else
+	echo -e "Using new tag \e[94m${this_tag}\e[0m"
+fi
 
-# echo -e "\e[1mONLY SIGN IF YOU APPROVE OF VERIFICATION AND DIFF ABOVE\e[0m"
+echo -e "\e[1mONLY SIGN IF YOU APPROVE OF VERIFICATION AND DIFF ABOVE\e[0m"
 
 # GITTAGEXTRA is for putting things like "-u 2117364A"
 # shellcheck disable=SC2086