From 09e66c7fb93992a996c56fe230720dfe84b9bbdf Mon Sep 17 00:00:00 2001 From: David J Parrott Date: Fri, 24 Jul 2026 20:30:09 -0400 Subject: [PATCH] wire-local-setup: support wire-sysio's renamed OPP bundle generator wire-sysio renamed libraries/opp/tools/scripts/generate-opp-bundles.fish to generate-opp-bundles.sh on master (8ce1b9bf90, 2026-07-08). The setup script still called the .fish name unconditionally, so any e2e image build against a post-rename wire-sysio ref failed at the OPP-bundle step: wire-local-setup.bash: line 479: ./scripts/generate-opp-bundles.fish: No such file or directory Prefer the .sh name and fall back to .fish, so both current mainlines and pre-rename branches (including the Dockerfile's current default, feature/opp-part2) keep building. Verified: wire-e2e-env built green against wire-sysio@master with this change (previously failed at the bundle step). Co-Authored-By: Claude Fable 5 Claude-Session: https://claude.ai/code/session_01K4FBvbwEeTj7ByeJzjehbQ --- scripts/wire-local-setup.bash | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/wire-local-setup.bash b/scripts/wire-local-setup.bash index b6ed055..f737af2 100755 --- a/scripts/wire-local-setup.bash +++ b/scripts/wire-local-setup.bash @@ -476,7 +476,13 @@ do done echo "wire-protobuf-bundler,protoc-gen-solana,protoc-gen-solidity are on the PATH" -./scripts/generate-opp-bundles.fish +# wire-sysio renamed the bundle generator .fish -> .sh; support both so older +# branches keep building. +if [ -x ./scripts/generate-opp-bundles.sh ]; then + ./scripts/generate-opp-bundles.sh +else + ./scripts/generate-opp-bundles.fish +fi popd log "wire-sysio: CMake configure & build"