revert: "fix: resolve shellcheck warnings" (#725)

Reverts #684 This commit has a regression for signing. Revert to unblock the release. Signed-off-by: Kevin Li <[email protected]>
runfinch · Dec 8, 2023 · 8ea255a · 8ea255a
1 parent 0105776
commit 8ea255a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -72,8 +72,7 @@ jobs:
         uses: ludeeus/[email protected]
         with:
           version: v0.9.0 
-          severity: warning
-        continue-on-error: false
+        continue-on-error: true
   go-mod-tidy-check:
     runs-on: ubuntu-latest
     steps:

diff --git a/installer-builder/darwin/Resources/uninstall.sh b/installer-builder/darwin/Resources/uninstall.sh
@@ -19,7 +19,7 @@ sudo pkill '^socket_vmnet'
 sudo pkill '^qemu-system-'
 sudo pkill '^limactl'
 
-if [ "$(readlink '/usr/local/bin/finch')" = "/Applications/Finch/bin/finch" ]; then sudo rm /usr/local/bin/finch; fi
+if [ "$$(readlink "/usr/local/bin/finch")" = "/Applications/Finch/bin/finch" ]; then sudo rm /usr/local/bin/finch; fi
 
 echo "[1/4] [DONE] Successfully deleted shortcut links"
 

diff --git a/installer-builder/tools/extract-executables.sh b/installer-builder/tools/extract-executables.sh
@@ -36,7 +36,7 @@ updateQEMUEntitlement() {
 
 #$1: the file object
 extractExecutables() {
-    for file in "$1"/{*,.*}
+    for file in $(ls -a "$1")
     do
         if [ -d "$1/$file" ];
         then

diff --git a/installer-builder/tools/merge-back-signed-executables.sh b/installer-builder/tools/merge-back-signed-executables.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 mergeBackSignedExecutables() {
-    for file in ./installer-builder/output/executables/signed/Payload/EXECUTABLES_TO_SIGN/{*,.*}
+    for file in $(ls -a ./installer-builder/output/executables/signed/Payload/EXECUTABLES_TO_SIGN)
     do
         if [[ $file != '.' && $file != '..' ]]
         then