multiple quoting fixes from sc & naming

esp8266 · mcspr · May 27, 2025 · May 27, 2025 · May 27, 2025 · May 27, 2025
commit eb1a54214d52270251bff5d9e022af9b51ea8a0c
diff --git a/tests/common.sh b/tests/common.sh
@@ -40,7 +40,7 @@ function step_summary()
     # ref. https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#adding-a-job-summary
     if [ -n "${GITHUB_STEP_SUMMARY-}" ]; then
         { echo "# $header"; echo '```console'; cat "$contents"; echo '```'; } \
-            >> $GITHUB_STEP_SUMMARY
+            >> "$GITHUB_STEP_SUMMARY"
     else
         echo "# $header"
         cat "$contents"
@@ -55,7 +55,7 @@ function print_size_info_header()
 
 function print_size_info()
 {
-    local awk_script='
+    local awk_script=$'
 /^\.data/ || /^\.rodata/ || /^\.bss/ || /^\.text/ || /^\.irom0\.text/{
     size[$1] = $2
 }
@@ -64,7 +64,7 @@ END {
     total_ram = size[".data"] + size[".rodata"] + size[".bss"]
     total_flash = size[".data"] + size[".rodata"] + size[".text"] + size[".irom0.text"]
 
-    printf "%-28s %-8d %-8d %-8d %-8d %-10d %-8d %-8d\n",
+    printf "%-28s %-8d %-8d %-8d %-8d %-10d %-8d %-8d\\n",
             sketch_name,
             size[".data"], size[".rodata"], size[".bss"], size[".text"], size[".irom0.text"],
             total_ram, total_flash
@@ -110,9 +110,9 @@ function format_fqbn()
     local flash_size=$2
     local lwip=$3
 
-    echo "esp8266com:esp8266:${board_name}:"\
-"eesz=${flash_size},"\
-"ip=${lwip}"
+    echo $"esp8266com:esp8266:${board_name}:
+eesz=${flash_size},
+ip=${lwip}"
 }
 
 function build_sketches()
@@ -131,16 +131,17 @@ function build_sketches()
     local build_out="$cache_dir"/out
     mkdir -p "$build_out"
 
-    local fqbn=$(format_fqbn "generic" "4M1M" "$lwip")
+    local fqbn
+    fqbn=$(format_fqbn "generic" "4M1M" "$lwip")
     echo "FQBN: $fqbn"
 
     local build_cmd
-    build_cmd+=${cli_path}
-    build_cmd+=" compile"\
-" --warnings=all"\
-" --fqbn $fqbn"\
-" --libraries $library_path"\
-" --output-dir $build_out"
+    build_cmd=$''"${cli_path}"'
+ compile
+ --warnings=all
+ --fqbn '"$fqbn"'
+ --libraries '"$library_path"'
+ --output-dir '"$build_out"''
 
     print_size_info_header >"$cache_dir"/size.log
 
@@ -300,9 +301,9 @@ function install_core()
 
     local debug_flags=""
     if [ "$debug" = "debug" ]; then
-        debug_flags="-DDEBUG_ESP_PORT=Serial -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM"\
-" -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI"\
-" -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM"
+        debug_flags=$'-DDEBUG_ESP_PORT=Serial -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
+ -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI
+ -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM'
     fi
 
     # Set our custom warnings for all builds

diff --git a/tests/test_mkbuildoptglobals.sh b/tests/test_mkbuildoptglobals.sh
@@ -13,15 +13,15 @@ function step_summary()
 
 export ARDUINO_BUILD_CACHE_PATH="$cache_dir"
 
-sketches="${cache_dir}/sketches/"
-cores="${cache_dir}/cores/"
-
 esp8266_dir="${ESP8266_ARDUINO_BUILD_DIR}"
 commonfileh="${esp8266_dir}/cores/esp8266/CommonHFile.h"
 
 tests_dir="$root/tests/test_mkbuildoptglobals"
 tests=$(ls -1 "$tests_dir" | sed 's/.sh$//g')
 
+cores_dir="${cache_dir}/cores/"
+sketches_dir="${cache_dir}/sketches/"
+
 function name_size_mtime()
 {
     stat --printf '%n:%s:%Y' "$1"
@@ -31,13 +31,21 @@ function most_recent_file()
 {
     local name="$1"
     local location="$2"
-    echo $(readlink -f "${location}/"$(ls -t1 "${location}" | grep "$name" | head -1))
+
+    local file
+    file=$(ls -t1 "${location}" | grep "$name" | head -1)
+
+    readlink -f "${location}/${file}"
 }
 
 function most_recent_dir()
 {
     local location="$1"
-    echo $(readlink -f "${location}/"$(ls -t1 "$location" | head -1))
+
+    local file
+    file=$(ls -t1 "$location" | head -1)
+
+    readlink -f "${location}/${file}"
 }
 
 function assert_build()
@@ -80,20 +88,25 @@ function build_esp8266_example()
 
 function make_commonh_stat()
 {
-    local stat=$(name_size_mtime "$commonfileh")
-    test -n "$stat"
+    local stat
+    stat=$(name_size_mtime "$commonfileh")
 
+    test -n "$stat"
     echo "$stat"
 }
 
 function make_core_stat()
 {
-    local recent_core=$(most_recent_dir "$cores")
-    local recent_file=$(most_recent_file "core.a" "$recent_core")
+    local recent_core
+    recent_core=$(most_recent_dir "$cores_dir")
 
-    local stat=$(name_size_mtime "$recent_file")
-    test -n "$stat"
+    local recent_file
+    recent_file=$(most_recent_file "core.a" "$recent_core")
 
+    local stat
+    stat=$(name_size_mtime "$recent_file")
+
+    test -n "$stat"
     echo "$stat"
 }
 
@@ -105,7 +118,7 @@ case "${1:-}" in
 "run")
     for test in $tests ; do
         printf "Checking \"%s\"\n" "$test"
-        /usr/bin/env bash $root/tests/test_mkbuildoptglobals.sh $test
+        /usr/bin/env bash "$root"/tests/test_mkbuildoptglobals.sh "$test"
     done
     ;;
 *)

diff --git a/tests/test_mkbuildoptglobals/buildopt_then_buildopt.sh b/tests/test_mkbuildoptglobals/buildopt_then_buildopt.sh
@@ -2,7 +2,7 @@ function buildopt_then_buildopt()
 {
     build_esp8266_example "GlobalBuildOptions"
 
-    local last_sketch=$(most_recent_dir "$sketches")
+    local last_sketch=$(most_recent_dir "$sketches_dir")
     assert_build "GlobalBuildOptions" "$last_sketch" 1
     assert_core 1
 
@@ -11,7 +11,7 @@ function buildopt_then_buildopt()
 
     build_esp8266_example "HwdtStackDump"
 
-    last_sketch=$(most_recent_dir "$sketches")
+    last_sketch=$(most_recent_dir "$sketches_dir")
     assert_build "HwdtStackDump" "$last_sketch" 1
     assert_core 1
 

diff --git a/tests/test_mkbuildoptglobals/buildopt_then_nobuildopt.sh b/tests/test_mkbuildoptglobals/buildopt_then_nobuildopt.sh
@@ -2,7 +2,7 @@ function buildopt_then_nobuildopt()
 {
     build_esp8266_example "GlobalBuildOptions"
 
-    local last_sketch=$(most_recent_dir "$sketches")
+    local last_sketch=$(most_recent_dir "$sketches_dir")
     assert_build "GlobalBuildOptions" "$last_sketch" 1
     assert_core 1
 
@@ -11,7 +11,7 @@ function buildopt_then_nobuildopt()
 
     build_esp8266_example "Blink"
 
-    last_sketch=$(most_recent_dir "$sketches")
+    last_sketch=$(most_recent_dir "$sketches_dir")
     assert_build "Blink" "$last_sketch" 0
     assert_core 0
 

diff --git a/tests/test_mkbuildoptglobals/nobuildopt.sh b/tests/test_mkbuildoptglobals/nobuildopt.sh
@@ -2,7 +2,7 @@ function nobuildopt()
 {
     build_esp8266_example "Blink"
 
-    local last_sketch=$(most_recent_dir "$sketches")
+    local last_sketch=$(most_recent_dir "$sketches_dir")
     assert_build "Blink" "$last_sketch" 0
     assert_core 0
 
@@ -11,7 +11,7 @@ function nobuildopt()
 
     build_esp8266_example "TestEspApi"
 
-    last_sketch=$(most_recent_dir "$sketches")
+    last_sketch=$(most_recent_dir "$sketches_dir")
     assert_build "TestEspApi" "$last_sketch" 0
     assert_core 0
 

diff --git a/tests/test_mkbuildoptglobals/nobuildopt_then_buildopt.sh b/tests/test_mkbuildoptglobals/nobuildopt_then_buildopt.sh
@@ -2,7 +2,7 @@ function nobuildopt_then_buildopt()
 {
     build_esp8266_example "Blink"
 
-    local last_sketch=$(most_recent_dir "$sketches")
+    local last_sketch=$(most_recent_dir "$sketches_dir")
     assert_build "Blink" "$last_sketch" 0
     assert_core 0
 
@@ -11,7 +11,7 @@ function nobuildopt_then_buildopt()
 
     build_esp8266_example "HwdtStackDump"
 
-    last_sketch=$(most_recent_dir "$sketches")
+    last_sketch=$(most_recent_dir "$sketches_dir")
     assert_build "HwdtStackDump" "$last_sketch" 1
     assert_core 1