2 files changed, 57 insertions, 2 deletions
diff --git a/hack/get_release_info.sh b/hack/get_release_info.sh
new file mode 100755
index 000000000..29b4237b4
--- /dev/null
+++ b/hack/get_release_info.sh
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+# This script produces various bits of metadata needed by Makefile.  Using
+# a script allows uniform behavior across multiple environments and
+# distributions.  The script expects a single argument, as reflected below.
+
+set -e
+
+cd "${GOSRC:-$(dirname $0)/../}"
+
+valid_args() {
+    REGEX='^\s+[[:upper:]]+\*[)]'
+    egrep --text --no-filename --group-separator=' ' --only-matching "$REGEX" "$0" | \
+        cut -d '*' -f 1
+}
+
+unset OUTPUT
+case "$1" in
+    # Wild-card suffix needed by valid_args() e.g. possible bad grep of "$(echo $FOO)"
+    VERSION*)
+        OUTPUT="${CIRRUS_TAG:-$(git fetch --tags && git describe HEAD 2> /dev/null)}"
+        ;;
+    NUMBER*)
+        OUTPUT="$($0 VERSION | sed 's/-.*//')"
+        ;;
+    DIST_VER*)
+        OUTPUT="$(source /etc/os-release; echo $VERSION_ID | cut -d '.' -f 1)"
+        ;;
+    DIST*)
+        OUTPUT="$(source /etc/os-release; echo $ID)"
+        ;;
+    ARCH*)
+        OUTPUT="${GOARCH:-$(go env GOARCH 2> /dev/null)}"
+        ;;
+    BASENAME*)
+        OUTPUT="${CIRRUS_REPO_NAME:-$(basename $(git rev-parse --show-toplevel))}"
+        ;;
+    REMOTENAME*)
+        OUTPUT="$($0 BASENAME)-remote"
+        ;;
+    *)
+        echo "Error, unknown/unsupported argument '$1', valid arguments:"
+        valid_args
+        exit 1
+        ;;
+esac
+
+if [[ -n "$OUTPUT" ]]
+then
+    echo -n "$OUTPUT"
+else
+    echo "Error, empty output for info: '$1'" > /dev/stderr
+    exit 2
+fi
diff --git a/hack/man-page-checker b/hack/man-page-checker
index 8e9b5a50d..ab1921b86 100755
--- a/hack/man-page-checker
+++ b/hack/man-page-checker
@@ -39,8 +39,9 @@ done
 # Pass 2: compare descriptions.
 #
 # Make sure the descriptive text in podman-foo.1.md matches the one
-# in the table in podman.1.md.
-for md in *.1.md;do
+# in the table in podman.1.md. podman-remote is not a podman subcommand,
+# so it is excluded here.
+for md in $(ls -1 *-*.1.md | grep -v remote);do
     desc=$(egrep -A1 '^#* NAME' $md|tail -1|sed -e 's/^podman[^ ]\+ - //')
 
     # podman.1.md has a two-column table; podman-*.1.md all have three.