poe

чување 51c86416f4c706c47ace37d7102d0aa29bd31971
родитељ f145e0ce08c7c571cc6f35b3011e21618a984c82
Аутор: Страхиња Радић <sr@strahinja.org>
Датум:   Tue, 17 Mar 2026 19:16:23 +0100

lib/make{date,version}: Synchronize build files with table

Diffstat:
M
lib/makedate
 | 
20
+++++++++++++++++---
M
lib/makeversion
 | 
24
+++++++++++++++++++-----

измењених датотека: 2, додавања: 36(+), брисања: 8(-)
diff --git a/lib/makedate b/lib/makedate
@@ -4,10 +4,22 @@ FALLBACKDATE=${FALLBACKDATE:-unknown}
 LC_ALL=C
 export LC_ALL
 
+die()
+{
+	printf "%s\n" "$@" >&2
+	exit 1
+}
+
+exists()
+{
+	command -v $* >/dev/null 2>&1
+}
+
 getent()
 {
 	geresult=''
-	if geresult=$(command getent "$@" 2>/dev/null); then
+	if exists getent; then
+		geresult=$(command getent "$@" 2>/dev/null)
 		return
 	fi
 	case "$1" in
@@ -22,7 +34,9 @@ getent()
 	esac
 }
 
-if [ -d .got ] && command -v got >/dev/null 2>&1; then
+exists diff || die "The build script $0 requires diff(1), none found"
+
+if [ -d .got ] && exists got; then
 	got log |
 	awk '
 	/^date: / {
@@ -43,7 +57,7 @@ if [ -d .got ] && command -v got >/dev/null 2>&1; then
 		print month_names[$2] " " $3 ", " $5
 		exit
 	}' >date.new
-elif [ -d .git ] && command -v git >/dev/null 2>&1; then
+elif [ -d .git ] && exists git; then
 	getent passwd "$(unalias ls >/dev/null 2>&1 || true; \
 		command ls -nd . | awk '{print $3}')"
 	user=$(printf "%s\n" "$geresult" | awk -F: '{print $1}')
diff --git a/lib/makeversion b/lib/makeversion
@@ -1,11 +1,25 @@
 #!/bin/sh -x
 # vim: set ft=bash:
 FALLBACKVER=${FALLBACKVER:-unknown}
+LC_ALL=C
+export LC_ALL
+
+die()
+{
+	printf "%s\n" "$@" >&2
+	exit 1
+}
+
+exists()
+{
+	command -v $* >/dev/null 2>&1
+}
 
 getent()
 {
 	geresult=''
-	if geresult=$(command getent "$@" 2>/dev/null); then
+	if exists getent; then
+		geresult=$(command getent "$@" 2>/dev/null)
 		return
 	fi
 	case "$1" in
@@ -20,7 +34,9 @@ getent()
 	esac
 }
 
-if [ -d .got ] && command -v got >/dev/null 2>&1; then
+exists diff || die "The build script $0 requires diff(1), none found"
+
+if [ -d .got ] && exists got; then
 	lastcommit=$(got log |
 		awk '/^commit/ {print substr($2,1,7); exit}')
 	got tag -l |
@@ -48,9 +64,7 @@ if [ -d .got ] && command -v got >/dev/null 2>&1; then
 			}
 			printf "\n"
 		}' >version.new
-elif [ -d .git ] && command -v git >/dev/null 2>&1; then
-	LC_ALL=C
-	export LC_ALL
+elif [ -d .git ] && exists git; then
 	getent passwd "$(unalias ls >/dev/null 2>&1 || true; \
 		command ls -nd . | awk '{print $3}')"
 	user=$(printf "%s\n" "$geresult" | awk -F: '{print $1}')