branch master updated: version check for GNU tar

[Gavin D. Smith]

This is an automated email from the git hooks/post-receive script.

gavin pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new bbcbb4dea9 version check for GNU tar
bbcbb4dea9 is described below

commit bbcbb4dea955c3cd82b7d43cecf30651726ca10c
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Mon Nov 18 18:29:46 2024 +0000

    version check for GNU tar
    
    * tp/maintain/regenerate_non_ascii_tar_file.sh: add version
    check for "GNU tar" before using extra flags in case of building
    from git.
---
 ChangeLog                                    |  8 ++++++++
 tp/maintain/regenerate_non_ascii_tar_file.sh | 12 ++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a35491a090..df96fa1cab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2024-11-18  Gavin Smith <gavinsmith0123@gmail.com>
+
+       version check for GNU tar
+
+       * tp/maintain/regenerate_non_ascii_tar_file.sh: add version
+       check for "GNU tar" before using extra flags in case of building
+       from git.
+
 2024-11-18  Gavin Smith <gavinsmith0123@gmail.com>
 
        * tp/maintain/regenerate_non_ascii_tar_file.sh: add maintenance
diff --git a/tp/maintain/regenerate_non_ascii_tar_file.sh 
b/tp/maintain/regenerate_non_ascii_tar_file.sh
index 3332d735a1..3e63fd3093 100755
--- a/tp/maintain/regenerate_non_ascii_tar_file.sh
+++ b/tp/maintain/regenerate_non_ascii_tar_file.sh
@@ -21,10 +21,14 @@ if ! test -d $input ; then
     exit 1
 fi
 
-# Used with GNU tar to try to get a reproducible file.
-# See https://reproducible-builds.org/docs/archives/.
-TAR_BUNDLE_DATE=2024-11-18T00:00
-TAR_BUNDLE_FLAGS="--sort=name --mtime=$TAR_BUNDLE_DATE --owner=0 --group=0 
--numeric-owner --format=ustar"
+if tar --version | grep "GNU tar" >/dev/null ; then
+  # Used with GNU tar to try to get a reproducible file.
+  # See https://reproducible-builds.org/docs/archives/.
+  TAR_BUNDLE_DATE=2024-11-18T00:00
+  TAR_BUNDLE_FLAGS="--sort=name --mtime=$TAR_BUNDLE_DATE --owner=0 --group=0 
--numeric-owner --format=ustar"
+else
+  TAR_BUNDLE_FLAGS=
+fi
 
 tar cf non_ascii.tar $input $TAR_BUNDLE_FLAGS