From cfbc4aaeb50b5fb12ec9363328bb08fc459a1067 Mon Sep 17 00:00:00 2001
From: Ed Santiago <santiago@redhat.com>
Date: Thu, 15 Sep 2022 16:18:46 -0600
Subject: Cleanup: fix problems reported by shell lint

Followup to #15616, which is not usable as it is (way, way, way
too much noise) but actually found a few real nits that should
be fixed.

Signed-off-by: Ed Santiago <santiago@redhat.com>
---
 hack/bats             | 4 ++--
 hack/check_root.sh    | 2 +-
 hack/man-page-checker | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'hack')

diff --git a/hack/bats b/hack/bats
index ca9835a1f..9bc2d2c15 100755
--- a/hack/bats
+++ b/hack/bats
@@ -106,7 +106,7 @@ export PODMAN_ROOTLESS_USER=$(id -un)
 
 # Root
 if [ -z "$ROOTLESS_ONLY" ]; then
-    echo "# bats ${bats_filter[@]} $TESTS"
+    echo "# bats ${bats_filter[*]} $TESTS"
     sudo    --preserve-env=PODMAN \
             --preserve-env=PODMAN_TEST_DEBUG \
             --preserve-env=OCI_RUNTIME \
@@ -119,7 +119,7 @@ fi
 # Rootless. (Only if we're not already root)
 if [[ -z "$ROOT_ONLY" && "$(id -u)" != 0 ]]; then
     echo "--------------------------------------------------"
-    echo "\$ bats ${bats_filter[@]} $TESTS"
+    echo "\$ bats ${bats_filter[*]} $TESTS"
     bats "${bats_opts[@]}" "${bats_filter[@]}" $TESTS
     rc=$((rc | $?))
 fi
diff --git a/hack/check_root.sh b/hack/check_root.sh
index 1f53887ff..2489a4edd 100755
--- a/hack/check_root.sh
+++ b/hack/check_root.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 if ! [ $(id -u) = 0 ]; then
-   echo "Please run as root! '$@' requires root privileges."
+   echo "Please run as root! '$*' requires root privileges."
    exit 1
 fi
diff --git a/hack/man-page-checker b/hack/man-page-checker
index 8ee0aaf6d..83e0b8b1d 100755
--- a/hack/man-page-checker
+++ b/hack/man-page-checker
@@ -87,7 +87,7 @@ function compare_usage() {
 
     # strip off command name from both
     from_man=$(sed -e "s/\*\*$cmd\*\*[[:space:]]*//" <<<"$from_man")
-    from_help=$(sed -e "s/^[[:space:]]*$cmd[[:space:]]*//" <<<"$from_help")
+    from_help=$(sed -e "s/^[[:space:]]*${cmd}[[:space:]]*//" <<<"$from_help")
 
     # man page lists 'foo [*options*]', help msg shows 'foo [flags]'.
     # Make sure if one has it, the other does too.
@@ -153,7 +153,7 @@ for md in *.1.md;do
         # special case: the command is "auto-update", with a hyphen
         md_nodash='podman auto-update'
     fi
-    if [ "$cmd" != "$md_nodash" -a "$cmd" != "podman-remote" ]; then
+    if [[ "$cmd" != "$md_nodash" ]] && [[ "$cmd" != "podman-remote" ]]; then
         echo
         printf "Inconsistent program name in SYNOPSIS in %s:\n" $md
         printf "  SYNOPSIS = %s (expected: '%s')\n" "$cmd" "$md_nodash"
-- 
cgit v1.2.3-54-g00ecf