diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-09-16 09:55:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-16 09:55:56 +0200 |
| commit | ccee741973a182f65af4e58302c9a76107974f0a (patch) | |
| tree | df1c78b6ad1f044b394862629c08c7a207d67a09 /hack | |
| parent | 0e3a0ec7d485a81b7ca38997e93bea69ad95d79a (diff) | |
| parent | cfbc4aaeb50b5fb12ec9363328bb08fc459a1067 (diff) | |
| download | podman-ccee741973a182f65af4e58302c9a76107974f0a.tar.gz podman-ccee741973a182f65af4e58302c9a76107974f0a.tar.bz2 podman-ccee741973a182f65af4e58302c9a76107974f0a.zip | |
Merge pull request #15829 from edsantiago/shlint
Cleanup: fix problems reported by shell lint
Diffstat (limited to 'hack')
| -rwxr-xr-x | hack/bats | 4 | ||||
| -rwxr-xr-x | hack/check_root.sh | 2 | ||||
| -rwxr-xr-x | hack/man-page-checker | 4 |
3 files changed, 5 insertions, 5 deletions
@@ -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" |