sled

чување 84b66da4a0436ee5b1b1b563798d7491f1ac24d4
родитељ 85b213c877af837c03ec3781b693d84b3e683757
Аутор: Страхиња Радић <contact@strahinja.org>
Датум:   Sat, 25 May 2024 12:55:51 +0200

lib/make{date,version}: Optimize version output

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

измењених датотека: 2, додавања: 25(+), брисања: 7(-)
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
@@ -4,12 +4,30 @@ 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
+		awk -v lastcommit=$(got log |
+			awk '/^commit/ {print substr($2,1,9); exit}') '
+		/^object: commit/ {
+			if (!lasttagcom)
+			{
+				lasttagcom = substr($3,1,9)
+			}
+			next
+		}
+		/^tag/ {
+			if (!ver)
+			{
+				sub(/^v/,"",$2)
+				ver = $2
+			}
+			next
+		}
+		END {
+			print ver
+			if (lastcommit != lasttagcom)
+			{
+				print "-" lastcommit
+			}
+		}' >version.new
 elif [ -d .git ] && command -v git >/dev/null 2>&1; then
 	LC_ALL=C
 	export LC_ALL