table

чување a8f78ceb6381c49919ea5e1addf16e0977510580
родитељ 331a87158591a601b0d430428d35bba25057e22b
Аутор: Страхиња Радић <contact@strahinja.org>
Датум:   Mon, 20 May 2024 21:07:47 +0200

lib/make{date,version}: Make the version use current commit if ahead of tag

Diffstat:
M
lib/makedate
 | 
2
+-
M
lib/makeversion
 | 
16
+++++++++-------

измењених датотека: 2, додавања: 10(+), брисања: 8(-)
diff --git a/lib/makedate b/lib/makedate
@@ -5,7 +5,7 @@ LC_ALL=C
 export LC_ALL
 
 if [ -d .got ] && command -v got >/dev/null 2>&1; then
-	got tag -l |
+	got log |
 	awk '
 	/^date: / {
 		sub(/^date: /,"",$0)
diff --git a/lib/makeversion b/lib/makeversion
@@ -3,13 +3,15 @@
 FALLBACKVER=${FALLBACKVER:-unknown}
 
 if [ -d .got ] && command -v got >/dev/null 2>&1; then
-	got tag -l |
-	awk '
-	/^tag/ {
-		sub(/^v/,"",$2)
-		print $2
-		exit
-	}' >version.new
+	lastcommit=$(got log | awk '/^commit/ {print substr($2,1,9); exit}')
+	lasttagcom=$(got tag -l |
+		awk '/^object: commit/ { print substr($3,1,9); exit}')
+	ver=$(got tag -l |
+		awk '/^tag/ { sub(/^v/,"",$2); print $2; exit }')
+	if [ "$lastcommit" != "$lasttagcom" ]; then
+		ver="${ver}-$lastcommit"
+	fi
+	printf "%s\n" "$ver" >version.new
 elif [ -d .git ] && command -v git >/dev/null 2>&1; then
 	LC_ALL=C
 	export LC_ALL