heavy-duty/rig
7
0
Fork 1
Code Issues 10 Pull requests Projects Releases 3 Packages Wiki Activity Actions

Merge pull request #5 from claude-hdb/fix/os-release-clobbers-version

Browse source 
fix: source /etc/os-release in a subshell — it clobbers $VERSION
This commit is contained in:
Daniel Marin 2026-07-11 20:39:32 +01:00 committed by GitHub
commit 5e5b864a74
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
commands/bootstrap.sh
View file

@ -58,11 +58,13 @@ fi
# --- guards ------------------------------------------------------------------ # --- guards ------------------------------------------------------------------
[ "$(id -u)" -eq 0 ] || die "must run as root" [ "$(id -u)" -eq 0 ] || die "must run as root"
if [ -r /etc/os-release ]; then if [ -r /etc/os-release ]; then
# Sourced in a subshell: os-release defines VERSION, NAME, ID, etc. —
# sourcing it in the main shell silently clobbers same-named script vars.
# shellcheck source=/dev/null # shellcheck source=/dev/null
. /etc/os-release OS_FAMILY="$(. /etc/os-release && printf '%s %s' "${ID:-}" "${ID_LIKE:-}")"
case "${ID:-} ${ID_LIKE:-}" in case "$OS_FAMILY" in
*debian*) ;; *debian*) ;;
*) warn "not a Debian-family system (ID=${ID:-unknown}); proceeding anyway" ;; *) warn "not a Debian-family system (${OS_FAMILY:-unknown}); proceeding anyway" ;;
esac esac
else else
warn "cannot read /etc/os-release; proceeding anyway" warn "cannot read /etc/os-release; proceeding anyway"

8
commands/runner-install.sh
View file

@ -75,11 +75,13 @@ VERSION="${VERSION#v}"
# --- guards ---------------------------------------------------------------- # --- guards ----------------------------------------------------------------
[ "$(id -u)" -eq 0 ] || die "must run as root" [ "$(id -u)" -eq 0 ] || die "must run as root"
if [ -r /etc/os-release ]; then if [ -r /etc/os-release ]; then
# Sourced in a subshell: os-release defines VERSION (e.g. "13 (trixie)"),
# which would clobber this script's $VERSION.
# shellcheck source=/dev/null # shellcheck source=/dev/null
. /etc/os-release OS_FAMILY="$(. /etc/os-release && printf '%s %s' "${ID:-}" "${ID_LIKE:-}")"
case "${ID:-} ${ID_LIKE:-}" in case "$OS_FAMILY" in
*debian*) ;; *debian*) ;;
*) warn "not a Debian-family system (ID=${ID:-unknown}); proceeding anyway" ;; *) warn "not a Debian-family system (${OS_FAMILY:-unknown}); proceeding anyway" ;;
esac esac
else else
warn "cannot read /etc/os-release; proceeding anyway" warn "cannot read /etc/os-release; proceeding anyway"

6
test/cli.sh
View file

@ -68,6 +68,12 @@ else
echo "skip: runner non-root refusal (running as root)" echo "skip: runner non-root refusal (running as root)"
fi fi
# Regression: /etc/os-release defines VERSION (e.g. "13 (trixie)" on Debian);
# sourcing it in the main shell clobbers a script's $VERSION and splices the
# OS string into download URLs. It must only ever be sourced in a subshell.
check "no main-shell os-release sourcing" 1 "" \
grep -rnE '^[[:space:]]*\.[[:space:]]+/etc/os-release' "$ROOT/commands"
echo "---" echo "---"
echo "$PASS passed, $FAIL failed" echo "$PASS passed, $FAIL failed"
[ "$FAIL" -eq 0 ] [ "$FAIL" -eq 0 ]