Skip to content

Commit

Permalink
revert: "fix: resolve shellcheck warnings" (#725)
Browse files Browse the repository at this point in the history
Reverts #684
This commit has a regression for signing. Revert to unblock the release.

Signed-off-by: Kevin Li <cnkevin@amazon.com>
  • Loading branch information
KevinLiAWS committed Dec 8, 2023
1 parent 0105776 commit 8ea255a
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 5 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,7 @@ jobs:
uses: ludeeus/action-shellcheck@2.0.0
with:
version: v0.9.0
severity: warning
continue-on-error: false
continue-on-error: true
go-mod-tidy-check:
runs-on: ubuntu-latest
steps:
Expand Down
2 changes: 1 addition & 1 deletion installer-builder/darwin/Resources/uninstall.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion installer-builder/tools/extract-executables.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion installer-builder/tools/merge-back-signed-executables.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 8ea255a

Please sign in to comment.