Changeset f882048 in Klonkt for scripts

Timestamp:

06/29/2026 11:58:19 PM (2 months ago)

Author:

roboburr <roboburr@…>

Branches:

main

Children:

e954722

Parents:

aedc00d

Message:

fix(install): a re-run keeps the install's existing channel (no silent switch to stable)

A re-run without --branch fell back to the stable default, which would silently switch an
existing main install onto stable. Now a re-run detects the branch the install already tracks
and stays on it; only an explicit --branch / KLONKT_BRANCH overrides, and a fresh install still
defaults to stable. The chosen channel is thus a persistent property of the install, not a
per-command default.

• scripts/install.sh — BRANCH_EXPLICIT flag (set by env KLONKT_BRANCH or --branch); on an existing .git checkout keep the current branch unless explicitly overridden; log the channel

Co-Authored-By: Claude <noreply@…>

File:

• scripts/install.sh (modified) (4 diffs)

scripts/install.sh

@@ -25 +25 @@
 # so a self-host auto-update (klonkt-update) never pulls work-in-progress. Use `--branch main`
 # for the bleeding-edge dev branch instead.
+KLONKT_BRANCH_SET="${KLONKT_BRANCH:+1}"   # channel chosen via env? (empty = no, "1" = yes)
 KLONKT_BRANCH="${KLONKT_BRANCH:-stable}"
 KLONKT_DIR="${KLONKT_DIR:-/opt/klonkt}"
@@ -35 +36 @@
 NODE_FORCE="${NODE_FORCE:-}"        # set to 1 to (re)install system Node anyway
 PORT_EXPLICIT=0
+BRANCH_EXPLICIT="${KLONKT_BRANCH_SET:-0}"   # 1 = operator chose the channel (env or --branch)
 
 while [ $# -gt 0 ]; do
@@ -40 +42 @@
     --domain) KLONKT_DOMAIN="$2"; shift 2;;
     --repo)   KLONKT_REPO="$2";   shift 2;;
-    --branch) KLONKT_BRANCH="$2"; shift 2;;
+    --branch) KLONKT_BRANCH="$2"; BRANCH_EXPLICIT=1; shift 2;;
     --dir)    KLONKT_DIR="$2";    shift 2;;
     --port)   KLONKT_PORT="$2"; PORT_EXPLICIT=1; shift 2;;
@@ -141 +143 @@
 if [ -d "$KLONKT_DIR/.git" ]; then
   git -C "$KLONKT_DIR" remote set-url origin "$KLONKT_REPO"
+  # Re-run on an EXISTING install: keep the channel this install already tracks — never
+  # silently switch it to the stable default. Only an explicit --branch / KLONKT_BRANCH
+  # overrides; a fresh install (else-branch) uses the stable default.
+  if [ "$BRANCH_EXPLICIT" != "1" ]; then
+    _cur=$(git -C "$KLONKT_DIR" rev-parse --abbrev-ref HEAD 2>/dev/null || true)
+    [ -n "$_cur" ] && [ "$_cur" != "HEAD" ] && KLONKT_BRANCH="$_cur"
+  fi
+  log "Channel: $KLONKT_BRANCH"
   git -C "$KLONKT_DIR" fetch --depth 1 origin "$KLONKT_BRANCH"
   # Check out FETCH_HEAD AS the target branch — not `reset --hard origin/$KLONKT_BRANCH`