From 92f35550f2c051af31f8da7a1db550a50c4c75a8 Mon Sep 17 00:00:00 2001 From: Viktor Barzin Date: Mon, 22 Jun 2026 08:02:31 +0000 Subject: [PATCH] workstation: self-deploy t3-provision-users from the repo each reconcile [ci skip] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Root cause of emo's lost memory: nothing redeployed /usr/local/bin/t3-provision-users except the manual setup-devvm.sh, so the homelab-memory rollout (44562535/9aa2438e, Jun 21) sat committed-but-undeployed for a day — the hourly reconcile kept running the pre-memory binary and never wired the new memory hooks for emo/anca. Close the gap the same way the script already treats managed-settings.json and start-claude.sh (sync_managed_config / deploy_user_launcher): the repo is the authoring surface. At the top of the run, if the repo copy differs from the deployed binary, install it and re-exec the fresh one. Guards: a re-exec env flag (no loop), bash -n (never deploy a broken script), DRY_RUN (no mutation), cmp (no churn when unchanged). Verified across all four paths in isolation. Co-Authored-By: Claude Opus 4.8 --- scripts/t3-provision-users.sh | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/scripts/t3-provision-users.sh b/scripts/t3-provision-users.sh index fc54faca..d95e037f 100644 --- a/scripts/t3-provision-users.sh +++ b/scripts/t3-provision-users.sh @@ -434,6 +434,28 @@ install_memory() { [[ $EUID -eq 0 ]] || { echo "t3-provision-users: must run as root" >&2; exit 1; } for bin in python3 jq; do command -v "$bin" >/dev/null || { echo "missing $bin" >&2; exit 1; }; done [[ -f "$ROSTER" && -f "$ENGINE" ]] || { echo "roster/engine not under $WORKSTATION_DIR" >&2; exit 1; } + +# 0) self-deploy: the repo is the authoring surface (like sync_managed_config / +# deploy_user_launcher below). Nothing else redeploys /usr/local/bin (only the +# manual setup-devvm.sh did) — so a committed edit silently never reached the +# hourly run until now (the homelab-memory rollout sat undeployed for a day). +# If the repo copy differs, install it and re-exec the fresh binary. Guarded: +# re-exec flag (no loop), bash -n (never deploy a broken script), DRY_RUN (no +# mutation), cmp (no churn when unchanged). +SELF_SRC="$WORKSTATION_DIR/../t3-provision-users.sh" +SELF_DST=/usr/local/bin/t3-provision-users +if [[ -z "${T3_PROVISION_SELF_DEPLOYED:-}" && -r "$SELF_SRC" ]] && ! cmp -s "$SELF_SRC" "$SELF_DST"; then + if [[ "$DRY_RUN" == 1 ]]; then + echo "[dry-run] self-deploy $SELF_DST from repo (changed)" + elif bash -n "$SELF_SRC" 2>/dev/null; then + install -m 0755 "$SELF_SRC" "$SELF_DST" + log "self-deployed $SELF_DST from repo (changed) — re-exec" + exec env T3_PROVISION_SELF_DEPLOYED=1 "$SELF_DST" "$@" + else + log "WARN: repo t3-provision-users.sh fails 'bash -n' — keeping deployed copy" + fi +fi + install -d -m 0755 "$ENVDIR" # 1) current sticky ports from existing .env files -> {os_user: port}