Skip to content

Commit

Permalink
Fix shellcheck linter warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
roryabraham committed Dec 7, 2022
1 parent b212e02 commit d9f5d05
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/scripts/validateActionsAndWorkflows.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ for ((i=0; i < ${#WORKFLOWS[@]}; i++)); do
done

# Wait for the background builds to finish
for PID in ${ASYNC_PROCESSES[*]}; do
for PID in "${ASYNC_PROCESSES[@]}"; do
wait $PID
RESULT=$?
if [[ $RESULT != 0 ]]; then
Expand Down
2 changes: 1 addition & 1 deletion .github/scripts/verifyActions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ if [[ EXIT_CODE -eq 0 ]]; then
exit 0
else
echo -e "${RED}Error: Diff found when Github Actions were rebuilt. Did you forget to run \`npm run gh-actions-build\` after a clean install (\`rm -rf node_modules && npm i\`)? Do you need to merge main?${NC}"
echo "$DIFF_OUTPUT" | $LIB_PATH/diff-so-fancy | less --tabs=4 -RFX
echo "$DIFF_OUTPUT" | "$LIB_PATH/diff-so-fancy" | less --tabs=4 -RFX
exit 1
fi
2 changes: 1 addition & 1 deletion .github/scripts/verifyPodfile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ podfileLockSha=$(awk '/PODFILE CHECKSUM: /{print $3}' ios/Podfile.lock)
echo "Podfile: $podfileSha"
echo "Podfile.lock: $podfileLockSha"

if [ $podfileSha == $podfileLockSha ]; then
if [ "$podfileSha" == "$podfileLockSha" ]; then
echo -e "${GREEN}Podfile verified!${NC}"
exit 0
else
Expand Down
2 changes: 1 addition & 1 deletion scripts/set-pusher-suffix.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ CONFIG_FILE="../Web-Expensify/_config.local.php"

if [ -f ".env" ]; then
# Export vars from the .env file to access the $EXPENSIFY_URL
export $(grep -v '^#' .env | xargs)
export "$(grep -v '^#' .env | xargs)"
fi

# use the suffix only when the config file can be found
Expand Down
2 changes: 1 addition & 1 deletion scripts/shellCheck.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ SHELL_SCRIPTS=$(find . -type d \( -path ./node_modules -o -path ./vendor -o -pat

ASYNC_PROCESSES=()
for SHELL_SCRIPT in $SHELL_SCRIPTS; do
npx shellcheck "$SHELL_SCRIPT" &
npx shellcheck -e SC1091 "$SHELL_SCRIPT" &
ASYNC_PROCESSES+=($!)
done

Expand Down
2 changes: 1 addition & 1 deletion tests/unit/getPullRequestsMergedBetweenTest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ git checkout main
git checkout -b version-bump
npm --no-git-tag-version version 1.1.1 -m "Update version to 1.1.1"
git add package.json package-lock.json
git commit -m "Update version to $(cat package.json | jq -r .version)"
git commit -m "Update version to $(jq -r .version < package.json)"
git checkout main
git merge version-bump --no-ff -m "Merge pull request #12 from Expensify/version-bump"
info "Merged PR #12 into main"
Expand Down

0 comments on commit d9f5d05

Please sign in to comment.