0b5043a9f3
gates / consistency-and-conventions (push) Successful in 26s
User report after the llamacpp app install: 'installed llama.cpp unknown', valid flags rejected (randomly per run), 'Model not found' for the HF downloader's own layout, and a systemd user-bus failure over SSH. Detective (real b10822 binary, FACT) found four independent causes: - version: llama-server --version prints to STDERR; detect_llama_version's 2>/dev/null swallowed it -> always 'unknown'. Now captures 2>&1 + accepts semver/build tokens (incl. build 1.2.3 edge) - validation: printf|grep -q under pipefail -> SIGPIPE rc=141 race randomly rejected flags present in the 59 KB --help. Now pipe-less grep (no race); 20x determinism regression test - model resolution: resolve_model accepted files only, but the HF downloader creates <models>/<repo>/file.gguf dirs. Now expands a dir with exactly one *.gguf (never silently picks; multi-gguf lists + errs) - port: llama.cpp default 8080 vs tool/adapter 8088; validation reliability means --port is now always pinned in the unit - user bus: headless/SSH sessions lack XDG_RUNTIME_DIR -> ensure_user_bus in lib/common.sh pre-flights all three systemctl --user tools with remediation text; pos ai server --no-unit direct-run escape hatch (pidfile) for boxes with no bus - find_llamacpp narrowed to llama-server/llama-server-cuda (bare 'server' fallback hazard); installer post-install sanity (version+help execute, symlink targets resolve) Architect decisions DQ1-DQ6 recorded. Tester: 4 new regression files (version-from-stderr, 25x flag-validation determinism, model dir expansion, bus pre-flight + E2E) + 3 fixture updates; suite 16 files / 269 checks. Verified: make gen idempotent; make check OK; make lint 0 FAIL, 0 WARN; make test 269/269 (~49s); bash -n clean; git diff --check clean.
177 lines
7.1 KiB
Bash
177 lines
7.1 KiB
Bash
# ── Colors (auto-off when not a TTY) ───────────────────────────
|
|
if [ -t 1 ]; then
|
|
CYAN=$(tput setaf 6)
|
|
GREEN=$(tput setaf 2)
|
|
YELLOW=$(tput setaf 3)
|
|
RED=$(tput setaf 1)
|
|
BLUE=$(tput setaf 4)
|
|
BOLD=$(tput bold)
|
|
DIM=$(tput dim)
|
|
RESET=$(tput sgr0)
|
|
else
|
|
CYAN=""; GREEN=""; YELLOW=""; RED=""; BLUE=""; BOLD=""; DIM=""; RESET=""
|
|
fi
|
|
|
|
# ── Config dir (env seam, XDG-aware) ───────────────────────────
|
|
# Canonical definition. Standalone-sourced files (notify.sh,
|
|
# config-ui.sh, the matrix/telegram tools) keep an identical guarded
|
|
# copy — see DEV.md "no shared lib? inline fallbacks".
|
|
CONFIG_DIR="${CONFIG_DIR:-${XDG_CONFIG_HOME:-$HOME/.config}/linux_post_install}"
|
|
|
|
# ── Core helpers ───────────────────────────────────────────────
|
|
log() { echo "${GREEN}[+]${RESET} $*"; }
|
|
warn() { echo "${YELLOW}[!]${RESET} $*"; }
|
|
err() { echo "${RED}ERROR:${RESET} $*" >&2; exit 1; }
|
|
ok() { echo "${GREEN} OK${RESET} $*"; }
|
|
|
|
# ── Section header ─────────────────────────────────────────────
|
|
section() {
|
|
local title="$*"
|
|
echo
|
|
echo "${CYAN}════════════════════════════════════════════${RESET}"
|
|
echo "${CYAN} ${title}${RESET}"
|
|
echo "${CYAN}════════════════════════════════════════════${RESET}"
|
|
}
|
|
|
|
# ── Step header (numbered) ─────────────────────────────────────
|
|
step() {
|
|
local current="$1" total="$2" msg="$3"
|
|
echo
|
|
echo "${BOLD} [${current}/${total}] ${msg}${RESET}"
|
|
echo "${BLUE} ─────────────────────────────────────────${RESET}"
|
|
}
|
|
|
|
# ── Dry-run aware executor ─────────────────────────────────────
|
|
run() {
|
|
if [ "${DRY_RUN:-0}" -eq 1 ]; then
|
|
log "(dry-run) $*"
|
|
else
|
|
"$@"
|
|
fi
|
|
}
|
|
|
|
# ── Internal: nanoseconds → formatted time string ─────────────
|
|
_nano_now() { date +%s%N; }
|
|
_elapsed() {
|
|
local start="$1" end
|
|
end=$(_nano_now)
|
|
local ms=$(( (end - start) / 1000000 ))
|
|
if [ "$ms" -ge 1000 ]; then
|
|
awk "BEGIN { printf \"%.1fs\", $ms / 1000 }"
|
|
elif [ "$ms" -ge 1 ]; then
|
|
echo "${ms}ms"
|
|
else
|
|
echo "0ms"
|
|
fi
|
|
}
|
|
|
|
# ── Timer ──────────────────────────────────────────────────────
|
|
TIMER_START=0
|
|
timer_start() { TIMER_START=$(_nano_now); }
|
|
timer_stop() { _elapsed "$TIMER_START"; }
|
|
|
|
# ── Timed command runner ───────────────────────────────────────
|
|
# Shows a spinner while the command runs in background,
|
|
# then prints result + elapsed time. Honors $DRY_RUN like run().
|
|
spawn() {
|
|
local msg="$1"
|
|
shift
|
|
if [ "${DRY_RUN:-0}" -eq 1 ]; then
|
|
log "(dry-run) ${msg}: $*"
|
|
return 0
|
|
fi
|
|
local start
|
|
start=$(_nano_now)
|
|
|
|
# Run in background, capture output
|
|
local out err rc
|
|
out=$(mktemp)
|
|
err=$(mktemp)
|
|
"$@" >"$out" 2>"$err" &
|
|
local pid=$!
|
|
|
|
# Spinner
|
|
local spin=('⠋' '⠙' '⠹' '⠸' '⠼' '⠴' '⠦' '⠧' '⠇' '⠏')
|
|
local i=0
|
|
while kill -0 "$pid" 2>/dev/null; do
|
|
printf "\r${CYAN} %s${RESET} %s" "${spin[$i]}" "$msg"
|
|
i=$(( (i + 1) % ${#spin[@]} ))
|
|
sleep 0.1
|
|
done
|
|
rc=0; wait "$pid" || rc=$?
|
|
local elapsed
|
|
elapsed=$(_elapsed "$start")
|
|
|
|
if [ "$rc" -eq 0 ]; then
|
|
printf "\r${GREEN} OK${RESET} %s (${elapsed})\n" "$msg"
|
|
else
|
|
printf "\r${RED} FAIL${RESET} %s (${elapsed})\n" "$msg"
|
|
# Show captured stderr on failure
|
|
if [ -s "$err" ]; then
|
|
sed 's/^/ /' "$err"
|
|
fi
|
|
rm -f "$out" "$err"
|
|
exit "$rc"
|
|
fi
|
|
rm -f "$out" "$err"
|
|
}
|
|
|
|
# ── Confirmation prompt ────────────────────────────────────────
|
|
# confirm <prompt> [default] — Enter accepts the DISPLAYED DEFAULT ('y'
|
|
# when omitted); explicit y/Y or n/N overrides; anything else (invalid
|
|
# input, EOF/closed stdin) denies. EOF fails closed and rc-safely ($yn is
|
|
# pre-initialized, so no set -u surprise on shells where read leaves it
|
|
# unset). Destructive call sites pass explicit 'n'.
|
|
confirm() {
|
|
local prompt="$1" default="${2:-y}" hint="[y/N]" yn=""
|
|
local d="${default,,}"
|
|
if [ "$d" = "y" ]; then
|
|
hint="[Y/n]"
|
|
fi
|
|
if ! read -rp "${prompt} ${hint}: " yn; then
|
|
return 1 # EOF / closed stdin — deny
|
|
fi
|
|
case "$yn" in
|
|
[Yy]) return 0 ;;
|
|
[Nn]) return 1 ;;
|
|
"") [ "$d" = "y" ] ;; # Enter → the displayed default
|
|
*) return 1 ;; # invalid input — deny
|
|
esac
|
|
}
|
|
|
|
# ── User systemd bus pre-flight ────────────────────────────────
|
|
# ensure_user_bus — verify the per-user systemd bus is reachable BEFORE a tool
|
|
# writes a unit file or calls `systemctl --user`. SSH/headless shells often
|
|
# have neither XDG_RUNTIME_DIR nor DBUS_SESSION_BUS_ADDRESS set; systemctl
|
|
# then fails AFTER an orphaned unit was already written. On failure errs with
|
|
# remediation and never returns, so callers abort before writing anything.
|
|
ensure_user_bus() {
|
|
systemctl --user show-environment &>/dev/null && return 0
|
|
err "cannot reach the user systemd bus (common in SSH/headless sessions) — systemctl --user failed
|
|
fix: export XDG_RUNTIME_DIR=/run/user/$(id -u) (if the directory exists)
|
|
fix: sudo loginctl enable-linger $(id -un) (persist the user session so the bus survives logouts)
|
|
no unit was written — fix the bus and retry"
|
|
}
|
|
|
|
# ── system.env loader ──────────────────────────────────────────
|
|
# Shared "system" tool config (~/.config/linux_post_install/system.env).
|
|
# Fills only variables that are not already exported — an explicitly-set
|
|
# environment variable always wins (flags > environment > file).
|
|
load_system_env() {
|
|
local f="$HOME/.config/linux_post_install/system.env" k v
|
|
[ -f "$f" ] || return 0
|
|
while IFS='=' read -r k v; do
|
|
[ -n "$k" ] || continue
|
|
case "$k" in
|
|
\#*) continue ;;
|
|
esac
|
|
v="${v%\"}"; v="${v#\"}"; v="${v%\'}"; v="${v#\'}"
|
|
if [ -z "${!k:-}" ]; then
|
|
export "$k"="$v"
|
|
fi
|
|
done < <(grep -E '^[A-Z_]+=' "$f" || true)
|
|
}
|
|
|
|
# ── Source guard ───────────────────────────────────────────────
|
|
return 0 2>/dev/null || true
|