mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-09-27 19:01:02 +00:00
fix shell check errors
This commit is contained in:
@@ -20,6 +20,10 @@
|
|||||||
# runs a WM on :10, and is the machine the user actually runs the product on — so the loop asserts
|
# 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
|
# 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.
|
# 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
|
set -uo pipefail
|
||||||
|
|
||||||
HOST="${HOST:-tommaso@100.103.234.2}"
|
HOST="${HOST:-tommaso@100.103.234.2}"
|
||||||
|
|||||||
@@ -35,15 +35,15 @@ step() {
|
|||||||
if "$@"; then echo "--- $name OK"; else echo "--- $name FAILED"; fail=1; fi
|
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
|
# 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
|
# 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
|
# 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.
|
# "FATAL no app window on :10", which reads like a dead app rather than a wrong display.
|
||||||
RIG_DISPLAY="${RIG_DISPLAY:-:11}"
|
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
|
run_in_rig() { # copy the script in fresh, then run it there
|
||||||
docker cp "$1" "$C:/tmp/$(basename "$1")" >/dev/null || return 1
|
docker cp "$1" "$C:/tmp/$(basename "$1")" >/dev/null || return 1
|
||||||
shift
|
shift
|
||||||
|
|||||||
Reference in New Issue
Block a user