Thanks -- I agree avoiding 'grep' is nice, I pushed this change inspired by your approach.
/Simon
From 83c5387249b5bbfd32d01a51af14ac53bac1bc36 Mon Sep 17 00:00:00 2001
From: Simon Josefsson <si...@josefsson.org>
Date: Sat, 28 Dec 2024 21:19:18 +0100
Subject: [PATCH] git-version-gen: avoid use of grep, suggested by Jim
Meyering.
* build-aux/git-version-gen: Use /bin/sh case instead.
---
ChangeLog | 5 +++++
build-aux/git-version-gen | 9 +++++----
2 files changed, 10 insertions(+), 4 deletions(-)
mode change 100755 => 100644 build-aux/git-version-gen
diff --git a/ChangeLog b/ChangeLog
index f8557f9ebc..533383ed94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2024-12-28 Simon Josefsson <si...@josefsson.org>
+
+ git-version-gen: avoid use of grep, suggested by Jim Meyering.
+ * build-aux/git-version-gen: Use /bin/sh case instead.
+
2024-12-28 Simon Josefsson <si...@josefsson.org>
git-version-gen: fix preceding change
diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
old mode 100755
new mode 100644
index 6d2b62ca3a..f0ca9156c1
--- a/build-aux/git-version-gen
+++ b/build-aux/git-version-gen
@@ -1,6 +1,6 @@
#!/bin/sh
# Print a version string.
-scriptversion=2024-12-28.19; # UTC
+scriptversion=2024-12-28.20; # UTC
# Copyright (C) 2007-2024 Free Software Foundation, Inc.
#
@@ -212,9 +212,10 @@ fi
if test "x$v" = xUNKNOWN \
&& test -f "$tarball_version_file"-git \
- && head -1 "$tarball_version_file"-git \
- | grep -v '^$Format' > /dev/null 2>&1; then
- v=$(head -1 "$tarball_version_file"-git)
+ && v=$(head -1 "$tarball_version_file"-git); then
+ case $v in
+ *Format*) v=UNKNOWN ;;
+ esac
fi
# Change the penultimate "-" to ".", for version-comparing tools.
--
2.47.1
signature.asc
Description: PGP signature
