From 0b43f66d948b86f5057aed5a3f564d1c3de492c7 Mon Sep 17 00:00:00 2001 From: Jendrik Date: Sun, 13 Apr 2025 18:14:40 +0200 Subject: [PATCH] improve quoting in .sh files thanks to shellcheck --- .github/calcrom/webhook.sh | 8 ++++---- asmdiff.sh | 10 +++++----- build_tools.sh | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/calcrom/webhook.sh b/.github/calcrom/webhook.sh index fd54b660b6..153dff8f00 100755 --- a/.github/calcrom/webhook.sh +++ b/.github/calcrom/webhook.sh @@ -1,11 +1,11 @@ #!/bin/bash -ex -build_name=$1 -map_file=$build_name.map -if [ ! -f $map_file ]; then +build_name="$1" +map_file="$build_name.map" +if [ ! -f "$map_file" ]; then echo "$map_file does not exist!" exit 1 fi -output=$(perl $(dirname "$0")/calcrom.pl $build_name.map | sed -E ':a;N;$!ba;s/\r{0,1}\n/\\n/g') +output=$(perl "$(dirname "$0")/calcrom.pl" "$build_name.map" | sed -E ':a;N;$!ba;s/\r{0,1}\n/\\n/g') curl -d "{\"username\": \"$CALCROM_DISCORD_WEBHOOK_USERNAME\", \"avatar_url\": \"$CALCROM_DISCORD_WEBHOOK_AVATAR_URL\", \"content\":\"\`\`\`\\n$build_name progress:\\n$output\\n\`\`\`\"}" -H "Content-Type: application/json" -X POST "$CALCROM_DISCORD_WEBHOOK_URL" diff --git a/asmdiff.sh b/asmdiff.sh index aca670e324..584453ce10 100755 --- a/asmdiff.sh +++ b/asmdiff.sh @@ -6,14 +6,14 @@ else OBJDUMP_BIN="arm-none-eabi-objdump" fi -OBJDUMP="$OBJDUMP_BIN -D -bbinary -marmv4t -Mforce-thumb" +OBJDUMP=("$OBJDUMP_BIN" -D -bbinary -marmv4t -Mforce-thumb) if [ $(($1)) -ge $((0x8000000)) ]; then - OPTIONS="--adjust-vma=0x8000000 --start-address=$(($1)) --stop-address=$(($1 + $2))" + OPTIONS=(--adjust-vma=0x8000000 --start-address=$(($1)) --stop-address=$(($1 + $2))) else - OPTIONS="--start-address=$(($1)) --stop-address=$(($1 + $2))" + OPTIONS=(--start-address=$(($1)) --stop-address=$(($1 + $2))) fi -$OBJDUMP $OPTIONS baserom.gba > baserom.dump -$OBJDUMP $OPTIONS pokeemerald.gba > pokeemerald.dump +"${OBJDUMP[@]}" "${OPTIONS[@]}" baserom.gba > baserom.dump +"${OBJDUMP[@]}" "${OPTIONS[@]}" pokeemerald.gba > pokeemerald.dump diff -u baserom.dump pokeemerald.dump diff --git a/build_tools.sh b/build_tools.sh index 93f6065be4..94ff92f2ea 100755 --- a/build_tools.sh +++ b/build_tools.sh @@ -2,7 +2,7 @@ echo "This script is deprecated. Next time, run \"make tools\" instead." for dname in tools/*; do - if [ -f ${dname}/Makefile ]; then - make -C ${dname} CXX=${1:-g++} --no-print-directory + if [ -f "${dname}/Makefile" ]; then + make -C "${dname}" "CXX=${1:-g++}" --no-print-directory fi done