fix: disable shellcheck instead of quoting

tj · Dec 19, 2024 · b5e760e · b5e760e
1 parent b4473c1
commit b5e760e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -36,10 +36,10 @@ jobs:
         env:
           # NOTE: use env to pass the output in order to avoid possible injection attacks
           FILES: "${{ steps.files.outputs.added_modified }}"
-      - name: Lint and format Python with Ruff
-        uses: astral-sh/ruff-action@v2
       - name: Shellcheck
         run: shellcheck --severity=error bin/* ./*.sh
+      - name: Lint and format Python with Ruff
+        uses: astral-sh/ruff-action@v2
 
   typo:
     runs-on: ubuntu-latest

diff --git a/bin/git-guilt b/bin/git-guilt
@@ -44,10 +44,12 @@ for file in $(git diff --name-only "$@")
 do
     test -n "$DEBUG" && echo "git blame $file"
     # $1 - since $2 - until
-    git blame "$NOT_WHITESPACE" --line-porcelain "$1" -- "$file" 2> /dev/null |
+    # shellcheck disable=SC2086
+    git blame $NOT_WHITESPACE --line-porcelain "$1" -- "$file" 2> /dev/null |
         LC_ALL=C sed -n "$PATTERN" | sort | uniq -c | LC_ALL=C sed 's/^\(.\)/- \1/' >> "$MERGED_LOG"
     # if $2 not given, use current commit as "until"
-    git blame "$NOT_WHITESPACE" --line-porcelain "${2-@}" -- "$file" 2> /dev/null |
+    # shellcheck disable=SC2086
+    git blame $NOT_WHITESPACE --line-porcelain "${2-@}" -- "$file" 2> /dev/null |
         LC_ALL=C sed -n "$PATTERN" | sort | uniq -c | LC_ALL=C sed 's/^\(.\)/+ \1/' >> "$MERGED_LOG"
 done
 

diff --git a/bin/git-repl b/bin/git-repl
@@ -44,9 +44,11 @@ while true; do
   esac
 
   if [[ $cmd == !*  ]]; then
-    eval "${cmd:1}"
+    # shellcheck disable=SC2086
+    eval ${cmd:1}
   elif [[ $cmd == git* ]]; then
-    eval "$cmd"
+    # shellcheck disable=SC2086
+    eval $cmd
   else
     eval git "$cmd"
   fi

diff --git a/bin/git-scp b/bin/git-scp
@@ -107,11 +107,12 @@ function scp_and_stage
 	if [ -n "$list" ]
 	then
 		local _TMP=${0///}
+        # shellcheck disable=SC2086
 		echo "$list" > "$_TMP" &&
-		_sanitize "$list" &&
+		_sanitize $list &&
 		_info "Pushing to $remote ($(git config "remote.$remote.url"))" &&
 		rsync -rlDv --files-from="$_TMP" ./ "$(git config "remote.$remote.url")/" &&
-		git add --force "$list" &&
+		git add --force $list &&
 		rm "$_TMP"
 	fi