Merge pull request #3121 from hi-rustin/rustin-patch-shell-check

Fix shell check warnings

Author: rbtcollins

.github/workflows/centos-fmt-clippy-on-all.yaml

@@ -82,9 +82,9 @@ jobs:
             sh ./ci/raw_init.sh
       - name: Run shell checks
         run: |
-          shellcheck -s dash -- rustup-init.sh
-          git ls-files -- '*.sh' | xargs shellcheck -s dash -e SC1090
-          git ls-files -- '*.bash' | xargs shellcheck -s bash -e SC1090
+          shellcheck -x -s dash -- rustup-init.sh
+          git ls-files -- '*.sh' | xargs shellcheck -x -s dash
+          git ls-files -- '*.bash' | xargs shellcheck -x -s bash
       - name: Run formatting checks
         run: |
           cargo fmt --all --check

ci/actions-templates/centos-fmt-clippy-template.yaml

@@ -82,9 +82,9 @@ jobs:
             sh ./ci/raw_init.sh
       - name: Run shell checks
         run: |
-          shellcheck -s dash -- rustup-init.sh
-          git ls-files -- '*.sh' | xargs shellcheck -s dash -e SC1090
-          git ls-files -- '*.bash' | xargs shellcheck -s bash -e SC1090
+          shellcheck -x -s dash -- rustup-init.sh
+          git ls-files -- '*.sh' | xargs shellcheck -x -s dash
+          git ls-files -- '*.bash' | xargs shellcheck -x -s bash
       - name: Run formatting checks
         run: |
           cargo fmt --all --check

ci/cirrus-templates/script.bash

@@ -1,4 +1,4 @@
-#!/bin/bash                                                                                            
+#!/bin/bash
 
 set -ex
 
@@ -26,6 +26,7 @@ echo "Install Rustup using ./rustup-init.sh"
 
 sh rustup-init.sh --default-toolchain=stable --profile=minimal -y
 # It's the equivalent of `source`
+# shellcheck source=src/cli/self_update/env.sh
 source "$HOME"/.cargo/env
 
 echo "========="

ci/fetch-rust-docker.bash

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 script_dir=$(cd "$(dirname "$0")" && pwd)
+# shellcheck source=ci/shared.bash
 . "$script_dir/shared.bash"
 
 set -e

ci/raw_init.sh

@@ -3,5 +3,6 @@
 set -ex
 
 sh ./rustup-init.sh --default-toolchain none -y
+# shellcheck source=src/cli/self_update/env.sh
 . "$HOME"/.cargo/env
 rustup -Vv

rustup-init.sh

@@ -597,7 +597,7 @@ check_help_for() {
     esac
 
     for _arg in "$@"; do
-        if ! "$_cmd" --help $_category | grep -q -- "$_arg"; then
+        if ! "$_cmd" --help "$_category" | grep -q -- "$_arg"; then
             return 1
         fi
     done