From b6c0475dcfe3dde9cc52dec569a38ac77fa44064 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Fri, 18 Sep 2026 14:09:08 +0800 Subject: [PATCH] fix shell check errors --- scripts/CAD/focus-loop.sh | 4 ++++ scripts/CAD/run-all-checks.sh | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/scripts/CAD/focus-loop.sh b/scripts/CAD/focus-loop.sh index 28cfec37ab..3c75f64a49 100755 --- a/scripts/CAD/focus-loop.sh +++ b/scripts/CAD/focus-loop.sh @@ -20,6 +20,10 @@ # runs a WM on :10, and is the machine the user actually runs the product on — so the loop asserts # against the shipping artefact rather than a stale twin. Reviving the rig means rebuilding its # deps image first; until then it cannot adjudicate anything about this code. +# +# SC2029: every ssh command below quotes locally-expanded config (HOST, SRC, DISP) on purpose +# -- the remote tree is not this checkout and has no such config of its own. +# shellcheck disable=SC2029 set -uo pipefail HOST="${HOST:-tommaso@100.103.234.2}" diff --git a/scripts/CAD/run-all-checks.sh b/scripts/CAD/run-all-checks.sh index 7928652051..1c0388ac89 100755 --- a/scripts/CAD/run-all-checks.sh +++ b/scripts/CAD/run-all-checks.sh @@ -35,15 +35,15 @@ step() { if "$@"; then echo "--- $name OK"; else echo "--- $name FAILED"; fail=1; fi } -# SC2329: every call goes through step(), which invokes it via "$@", so shellcheck -# cannot see the callers below. -# shellcheck disable=SC2329 # This fork's rig runs Xvfb on :11, the other fork's on :10, and the check scripts default # to ":10" when DISPLAY is unset -- which docker exec leaves unset. The rungs that drive the # GUI therefore looked for a window on a display that does not exist here and reported # "FATAL no app window on :10", which reads like a dead app rather than a wrong display. RIG_DISPLAY="${RIG_DISPLAY:-:11}" +# SC2329: every call goes through step(), which invokes it via "$@", so shellcheck +# cannot see the callers below. +# shellcheck disable=SC2329 run_in_rig() { # copy the script in fresh, then run it there docker cp "$1" "$C:/tmp/$(basename "$1")" >/dev/null || return 1 shift