[groff] 04/13: contrib/gdiffmk/gdiffmk.sh: Tweak diagnostics.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 7f84509dcb7ea2bf293047fe42a09c6df282c001
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Tue Dec 19 11:04:57 2023 -0600

    contrib/gdiffmk/gdiffmk.sh: Tweak diagnostics.
    
    * contrib/gdiffmk/gdiffmk.sh: Use only one space after {command name,
      colon} sequence in diagnostic messages, not two.  This aligns better
      with the GNU Coding Standards.  Also downcase "Usage".
    * contrib/gdiffmk/tests/baseline.7: Update test expectations.
---
 contrib/gdiffmk/ChangeLog        | 7 +++++++
 contrib/gdiffmk/gdiffmk.sh       | 8 ++++----
 contrib/gdiffmk/tests/baseline.7 | 4 ++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/contrib/gdiffmk/ChangeLog b/contrib/gdiffmk/ChangeLog
index b0c7c0095..8f8e85f19 100644
--- a/contrib/gdiffmk/ChangeLog
+++ b/contrib/gdiffmk/ChangeLog
@@ -1,3 +1,10 @@
+2023-12-19  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * gdiffmk.sh: Use only one space after {command name, colon}
+       sequence in diagnostic messages, not two.  This aligns better
+       with the GNU Coding Standards.
+       * tests/baseline.7: Update test expectations.
+
 2023-07-17  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * tests/runtests.sh: Stop endorsing shebang line space myth.
diff --git a/contrib/gdiffmk/gdiffmk.sh b/contrib/gdiffmk/gdiffmk.sh
index 2473fb105..2c76c1179 100644
--- a/contrib/gdiffmk/gdiffmk.sh
+++ b/contrib/gdiffmk/gdiffmk.sh
@@ -25,11 +25,11 @@ CMD=`basename $0`
 Usage () {
        if test $# -gt 0
        then
-               echo >&2 "${CMD}:  $@"
+               echo >&2 "${CMD}: $@"
        fi
        echo >&2 "\
 
-Usage:  ${CMD} [ OPTIONS ] FILE1 FILE2 [ OUTPUT ]
+usage: ${CMD} [ OPTIONS ] FILE1 FILE2 [ OUTPUT ]
 Place difference marks into the new version of a groff/nroff/troff document.
 FILE1 and FILE2 are compared, using 'diff', and FILE2 is output with
 groff '.mc' requests added to indicate how it is different from FILE1.
@@ -70,7 +70,7 @@ Exit () {
        shift
        for arg
        do
-               echo >&2 "${CMD}:  $1"
+               echo >&2 "${CMD}: $1"
                shift
        done
        exit ${exitcode}
@@ -232,7 +232,7 @@ do
                break
                ;;
        -*)
-               BADOPTION="${CMD}:  invalid option '$1'"
+               BADOPTION="${CMD}: invalid option '$1'"
                ;;
        *)
                break
diff --git a/contrib/gdiffmk/tests/baseline.7 b/contrib/gdiffmk/tests/baseline.7
index 4a83af63b..1b5cfe917 100644
--- a/contrib/gdiffmk/tests/baseline.7
+++ b/contrib/gdiffmk/tests/baseline.7
@@ -1,2 +1,2 @@
-gdiffmk:  The FILE2 and OUTPUT arguments both point to the same file,
-gdiffmk:  './contrib/gdiffmk/tests/tmp_file.7', and it would be overwritten.
+gdiffmk: The FILE2 and OUTPUT arguments both point to the same file,
+gdiffmk: './contrib/gdiffmk/tests/tmp_file.7', and it would be overwritten.