From c5de6b97d61c64092b1d3d61a33002de9c01931e Mon Sep 17 00:00:00 2001 From: "Patrick J.P. Culp" Date: Fri, 28 Aug 2026 19:05:16 +0000 Subject: [PATCH] tools: add support for Twoliter.override in docker-run Signed-off-by: Patrick J.P. Culp --- tools/docker-run.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/docker-run.sh b/tools/docker-run.sh index 3d33b7a6d..dc0bcdf15 100755 --- a/tools/docker-run.sh +++ b/tools/docker-run.sh @@ -9,7 +9,14 @@ bail() { } find_sdk() { - grep -A5 '^\[sdk\]' Twoliter.lock | grep '^source' | cut -d'"' -f2 + local sdk_source sdk_override + sdk_source="$(grep -A5 '^\[sdk\]' Twoliter.lock | grep '^source' | cut -d'"' -f2)" + if [[ -s "Twoliter.override" ]]; then + echo "Resolving SDK via twoliter update" >&2 + sdk_override="$(./tools/twoliter/twoliter update 2>&1 \ + | awk -F'overridden-to: ' 'NF>1 {split($2, a, ")"); print a[1]; exit}')" + fi + echo "${sdk_override:-$sdk_source}" } SCRIPT_PATH="$1"