lib scripts: add "(GNU Automake)" to --version output, etc.

* lib/ar-lib: add "(GNU Automake)" to --version output,
and the "Report bugs" block to --help.
* lib/compile: likewise.
* lib/depcomp: likewise.
* lib/install-sh: likewise.
* lib/mdate-sh: likewise.
* lib/missing: likewise.
* lib/mkinstalldirs: likewise.
* lib/py-compile: likewise.
* lib/tap-driver.sh: likewise.
* lib/test-driver: likewise.
* lib/ylwrap: likewise.
* t/py-compile-usage.sh: update --version pattern.

diff --git a/lib/ar-lib b/lib/ar-lib
index c74c46c379c94ac75aaeea18772ad9a8c5260d24..15219874966bca4e3d49a0157ccbfeee08fe9929 100755 (executable)
--- a/lib/ar-lib
+++ b/lib/ar-lib
@@ -2,7 +2,7 @@
 # Wrapper for Microsoft lib.exe
 
 me=ar-lib
-scriptversion=2019-07-04.01; # UTC
+scriptversion=2024-06-19.01; # UTC
 
 # Copyright (C) 2010-2024 Free Software Foundation, Inc.
 # Written by Peter Rosin <peda@lysator.liu.se>.
@@ -105,11 +105,15 @@ case $1 in
 Usage: $me [--help] [--version] PROGRAM ACTION ARCHIVE [MEMBER...]
 
 Members may be specified in a file named with @FILE.
+
+Report bugs to <bug-automake@gnu.org>.
+GNU Automake home page: <https://www.gnu.org/software/automake/>.
+General help using GNU software: <https://www.gnu.org/gethelp/>.
 EOF
     exit $?
     ;;
   -v | --v*)
-    echo "$me, version $scriptversion"
+    echo "$me (GNU Automake) $scriptversion"
     exit $?
     ;;
 esac

diff --git a/lib/compile b/lib/compile
index 2818b7ded4c36f4ce7a6e5fe7d3eb6478e90b7d7..49b3d05fde434a96423b83f31ccafe27e87ba6ef 100755 (executable)
--- a/lib/compile
+++ b/lib/compile
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2023-11-23.18; # UTC
+scriptversion=2024-06-19.01; # UTC
 
 # Copyright (C) 1999-2024 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
@@ -254,7 +254,7 @@ EOF
     exit $?
     ;;
   -v | --v*)
-    echo "compile $scriptversion"
+    echo "compile (GNU Automake) $scriptversion"
     exit $?
     ;;
   cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \

diff --git a/lib/depcomp b/lib/depcomp
index 4ade066242fa32ff553fbc64343fff2f7f25e01e..1f0aa972c93e5869704dec4354e115f498ad57bf 100755 (executable)
--- a/lib/depcomp
+++ b/lib/depcomp
@@ -1,7 +1,7 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2024-06-07.03; # UTC
+scriptversion=2024-06-19.01; # UTC
 
 # Copyright (C) 1999-2024 Free Software Foundation, Inc.
 
@@ -53,7 +53,7 @@ EOF
     exit $?
     ;;
   -v | --v*)
-    echo "depcomp $scriptversion"
+    echo "depcomp (GNU Automake) $scriptversion"
     exit $?
     ;;
 esac

diff --git a/lib/install-sh b/lib/install-sh
index e0af0fe2feb9c32c5cc36ec84211a520a0072d88..b1d7a6f67f61f9fb53b653d557bdef8fbc1e20e0 100755 (executable)
--- a/lib/install-sh
+++ b/lib/install-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2024-06-07.14; # UTC
+scriptversion=2024-06-19.01; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -170,7 +170,7 @@ while test $# -ne 0; do
 
     -T) is_target_a_directory=never;;
 
-    --version) echo "$0 $scriptversion"; exit $?;;
+    --version) echo "$0 (GNU Automake) $scriptversion"; exit $?;;
 
     --) shift
         break;;

diff --git a/lib/mdate-sh b/lib/mdate-sh
index 88f306d709ff6ed29253e496c6510a684eab9b2b..764e142eef0ccf1ff5c763d02f6987eb5294d2e7 100755 (executable)
--- a/lib/mdate-sh
+++ b/lib/mdate-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Get modification time of a file or directory and pretty-print it.
 
-scriptversion=2023-11-23.18; # UTC
+scriptversion=2024-06-19.01; # UTC
 
 # Copyright (C) 1995-2024 Free Software Foundation, Inc.
 # written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, June 1995
@@ -56,7 +56,7 @@ EOF
     exit $?
     ;;
   -v | --v*)
-    echo "mdate-sh $scriptversion"
+    echo "mdate-sh (GNU Automake) $scriptversion"
     exit $?
     ;;
 esac

diff --git a/lib/missing b/lib/missing
index 303e65563056f18e474e755dfc810ffecc5b7ce5..7e7d78ec52c949bb9157dc88defa6a191eebfad5 100755 (executable)
--- a/lib/missing
+++ b/lib/missing
@@ -69,7 +69,7 @@ General help using GNU software: <https://www.gnu.org/gethelp/>."
     ;;
 
   -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing $scriptversion (GNU Automake)"
+    echo "missing (GNU Automake) $scriptversion"
     exit $?
     ;;
 

diff --git a/lib/mkinstalldirs b/lib/mkinstalldirs
index 83e8e31ecddbc92f192fd001984ebfef589d0e82..e536369cc66b5e3f284f2cdcdfe30cd7ade8be75 100755 (executable)
--- a/lib/mkinstalldirs
+++ b/lib/mkinstalldirs
@@ -1,7 +1,7 @@
 #! /bin/sh
 # mkinstalldirs --- make directory hierarchy
 
-scriptversion=2023-11-23.18; # UTC
+scriptversion=2024-06-19.01; # UTC
 
 # Original author: Noah Friedman <friedman@prep.ai.mit.edu>
 # Created: 1993-05-16
@@ -41,7 +41,7 @@ while test $# -gt 0 ; do
       shift
       ;;
     --version)
-      echo "$0 $scriptversion"
+      echo "$0 (GNU Automake) $scriptversion"
       exit $?
       ;;
     --)                         # stop option processing

diff --git a/lib/py-compile b/lib/py-compile
index 4989ceee92ca3f74276199a797f785f99f3be9e4..c9d4fde94fb91f6210e6b021c47adf4a85df3639 100755 (executable)
--- a/lib/py-compile
+++ b/lib/py-compile
@@ -1,7 +1,7 @@
 #!/bin/sh
 # py-compile - Compile a Python program
 
-scriptversion=2023-11-23.18; # UTC
+scriptversion=2024-06-19.01; # UTC
 
 # Copyright (C) 2000-2024 Free Software Foundation, Inc.
 
@@ -85,7 +85,7 @@ EOF
       exit $?
       ;;
     -v|--version)
-      echo "$me $scriptversion"
+      echo "$me (GNU Automake) $scriptversion"
       exit $?
       ;;
     --)

diff --git a/lib/tap-driver.sh b/lib/tap-driver.sh
index 01d362fa5d003c26fee9c3c7c266f38477cddfba..bd9597588fd31bb8409086e63bdf614afd6cd00d 100755 (executable)
--- a/lib/tap-driver.sh
+++ b/lib/tap-driver.sh
@@ -23,7 +23,7 @@
 # bugs to <bug-automake@gnu.org> or send patches to
 # <automake-patches@gnu.org>.
 
-scriptversion=2013-12-23.17; # UTC
+scriptversion=2024-06-19.01; # UTC
 
 # Make unconditional expansion of undefined variables an error.  This
 # helps a lot in preventing typo-related bugs.
@@ -54,6 +54,10 @@ Usage:
                 [--diagnostic-string STRING] [--merge|--no-merge]
                 [--comments|--no-comments] [--] TEST-COMMAND
 The '--test-name', '-log-file' and '--trs-file' options are mandatory.
+
+Report bugs to <bug-automake@gnu.org>.
+GNU Automake home page: <https://www.gnu.org/software/automake/>.
+General help using GNU software: <https://www.gnu.org/gethelp/>.
 END
 }
 
@@ -71,7 +75,7 @@ diag_string='#'
 while test $# -gt 0; do
   case $1 in
   --help) print_usage; exit $?;;
-  --version) echo "$me $scriptversion"; exit $?;;
+  --version) echo "$me (GNU Automake) $scriptversion"; exit $?;;
   --test-name) test_name=$2; shift;;
   --log-file) log_file=$2; shift;;
   --trs-file) trs_file=$2; shift;;

diff --git a/lib/test-driver b/lib/test-driver
index e04b5a210c2496d1ca8badb711ddadef56057950..5c3ae820f9a374a905ce2ef7778c1990619b37aa 100755 (executable)
--- a/lib/test-driver
+++ b/lib/test-driver
@@ -1,7 +1,7 @@
 #! /bin/sh
 # test-driver - basic testsuite driver script.
 
-scriptversion=2024-06-07.11; # UTC
+scriptversion=2024-06-19.01; # UTC
 
 # Copyright (C) 2011-2024 Free Software Foundation, Inc.
 #
@@ -50,6 +50,11 @@ Usage:
 
 The '--test-name', '--log-file' and '--trs-file' options are mandatory.
 See the GNU Automake documentation for information.
+
+
+Report bugs to <bug-automake@gnu.org>.
+GNU Automake home page: <https://www.gnu.org/software/automake/>.
+General help using GNU software: <https://www.gnu.org/gethelp/>.
 END
 }
 
@@ -63,7 +68,7 @@ enable_hard_errors=yes
 while test $# -gt 0; do
   case $1 in
   --help) print_usage; exit $?;;
-  --version) echo "test-driver $scriptversion"; exit $?;;
+  --version) echo "test-driver (GNU Automake) $scriptversion"; exit $?;;
   --test-name) test_name=$2; shift;;
   --log-file) log_file=$2; shift;;
   --trs-file) trs_file=$2; shift;;

diff --git a/lib/ylwrap b/lib/ylwrap
index f945f4b9e5b9d5289b6096372e335f67088b4249..9e63acd92a22526ee9de5b16e5ae840501bc59f3 100755 (executable)
--- a/lib/ylwrap
+++ b/lib/ylwrap
@@ -1,7 +1,7 @@
 #! /bin/sh
 # ylwrap - wrapper for lex/yacc invocations.
 
-scriptversion=2023-11-23.18; # UTC
+scriptversion=2024-06-19.01; # UTC
 
 # Copyright (C) 1996-2024 Free Software Foundation, Inc.
 #
@@ -87,7 +87,7 @@ EOF
     exit $?
     ;;
   -v|--v*)
-    echo "ylwrap $scriptversion"
+    echo "ylwrap (GNU Automake) $scriptversion"
     exit $?
     ;;
 esac

diff --git a/t/py-compile-usage.sh b/t/py-compile-usage.sh
index 5ab92e13f302118dd32444bdace58cec0951311c..d134faca608b412d3142fe7fdad57da9c9f364a3 100644 (file)
--- a/t/py-compile-usage.sh
+++ b/t/py-compile-usage.sh
@@ -38,11 +38,11 @@ $FGREP ' --destdir DIR ' stdout
   || { cat stdout; cat stderr >&2; exit 1; }
 cat stdout
 test -s stderr && { cat stderr >&2; exit 1; }
-year='20[0-9][0-9]' # Hopefully automake will be obsolete in 80 years ;-)
+year='2[0-9][0-9][0-9]'
 month='(0[0-9]|1[012])'
 day='([012][0-9]|3[01])'
 hour='([01][0-9]|2[0123])'
-LC_ALL=C $EGREP "^py-compile $year-$month-$day\.$hour" stdout
+LC_ALL=C $EGREP "^py-compile .* $year-$month-$day\.$hour" stdout
 test $(wc -l <stdout) -eq 1
 
 # Unknown option.