From 10fb1ab5ac9091e59957e97c3e75ea6bc288b8c5 Mon Sep 17 00:00:00 2001 From: Igor Soarez Date: Mon, 5 Oct 2026 12:02:45 +0300 Subject: tmuxrdr: build and run as its own binary beside stock herdr scripts/build builds the checkout with the pinned toolchains -- Homebrew's keg-only rustup, Zig 0.16.0 from ~/.local/opt, crates through sfw, Zig's hash-pinned packages prefetched by Zig since sfw's proxy breaks them -- and installs it as ~/.local/bin/tmuxrdr. install now sets up tmuxrdr only, in ~/.config/tmuxrdr, and refuses a binary that reads its config elsewhere. test-e2e tests tmuxrdr and starts with a config check. The config turns off herdr's update check, whose update would install stock herdr over the fork. --- tmuxrdr/scripts/sync-upstream | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'tmuxrdr/scripts/sync-upstream') diff --git a/tmuxrdr/scripts/sync-upstream b/tmuxrdr/scripts/sync-upstream index 44c1b010..d73b05df 100755 --- a/tmuxrdr/scripts/sync-upstream +++ b/tmuxrdr/scripts/sync-upstream @@ -7,7 +7,8 @@ # tmuxrdr/scripts/sync-upstream v0.9.4 that release # # Releases, not upstream's master: a release is what Homebrew ships, so a -# tmuxrdr build speaks the same protocol as any stock herdr server around it. +# tmuxrdr build and the stock herdr beside it stay on the same version, and +# their CLIs can talk to each other's servers. # The base is the newest release tag behind HEAD; the tmuxrdr commits are # everything after it. The branch as it was is kept as tmuxrdr-on-, # so a bad rebase costs nothing: `git switch -C tmuxrdr tmuxrdr-on-`. @@ -62,11 +63,5 @@ fi echo echo "$branch is on $target; the old one is kept as $backup." -installed="$("${HERDR:-herdr}" --version 2>/dev/null | awk '{print "v" $2}')" -if [[ "$installed" != "$target" ]]; then - echo "herdr on PATH is ${installed:-missing}, not $target: test against $target" - echo "(upgrade it, or build this checkout -- README.md) before trusting test-e2e." -fi -HERDR_CONFIG_PATH="$PWD/tmuxrdr/config/config.toml" "${HERDR:-herdr}" config check \ - || echo "config check found issues against the herdr on PATH; see above" -echo "Next: tmuxrdr/scripts/test-e2e" +echo "Next: tmuxrdr/scripts/build, then tmuxrdr/scripts/test-e2e." +echo "(The installed tmuxrdr is still the $old build until build replaces it.)" -- cgit v1.2.3