From ff1e879062735d57ecd821a91e9a3304ff373102 Mon Sep 17 00:00:00 2001 From: River Phillips Date: Sat, 4 Nov 2023 08:18:15 +0000 Subject: [PATCH 1/2] fix: resolve shellcheck warnings Signed-off-by: River Phillips --- installer-builder/darwin/Resources/uninstall.sh | 2 +- installer-builder/tools/extract-executables.sh | 2 +- installer-builder/tools/merge-back-signed-executables.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/installer-builder/darwin/Resources/uninstall.sh b/installer-builder/darwin/Resources/uninstall.sh index 4e86369ea..ab60a0285 100755 --- 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/3] [DONE] Successfully deleted shortcut links" diff --git a/installer-builder/tools/extract-executables.sh b/installer-builder/tools/extract-executables.sh index 5790cfe8b..432f78ef6 100755 --- 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 $(ls -a "$1") + for file in "$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 index 4e276c9ca..0372dae4a 100755 --- 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 $(ls -a ./installer-builder/output/executables/signed/Payload/EXECUTABLES_TO_SIGN) + for file in ./installer-builder/output/executables/signed/Payload/EXECUTABLES_TO_SIGN/{*,.*} do if [[ $file != '.' && $file != '..' ]] then From 1d8e734750a5e550eccf02d863a65e6fcef39a03 Mon Sep 17 00:00:00 2001 From: River Phillips Date: Sat, 4 Nov 2023 08:19:13 +0000 Subject: [PATCH 2/2] ci: require shellcheck to pass Signed-off-by: River Phillips --- .github/workflows/ci.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 5dd29fc90..c5a20e4ae 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -72,7 +72,8 @@ jobs: uses: ludeeus/action-shellcheck@2.0.0 with: version: v0.9.0 - continue-on-error: true + severity: warning + continue-on-error: false go-mod-tidy-check: runs-on: ubuntu-latest steps: