From 63106f5e3faa2d4b77613d9dcc87e6259ef6a75b Mon Sep 17 00:00:00 2001 From: rain Date: Wed, 26 Aug 2026 13:52:35 -0400 Subject: [PATCH] bootstrap: require chaotic-aur repo in pacman.conf for skip; topgrade cargo fallback --- run_once_10-add-chaotic-aur.sh.tmpl | 4 ++-- run_onchange_30-ensure-cargo.sh.tmpl | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/run_once_10-add-chaotic-aur.sh.tmpl b/run_once_10-add-chaotic-aur.sh.tmpl index 3d84896..310af6a 100755 --- a/run_once_10-add-chaotic-aur.sh.tmpl +++ b/run_once_10-add-chaotic-aur.sh.tmpl @@ -21,8 +21,8 @@ die() { printf '\033[1;31m[chaotic ERROR]\033[0m %s\n' "$*" >&2; exit 1; } # and pacman-key operations below. {{ if eq .os_family "arch" -}} -if command -v paru >/dev/null 2>&1; then - log "paru already installed — skipping chaotic setup" +if command -v paru >/dev/null 2>&1 && sudo grep -q "^\[chaotic-aur\]" /etc/pacman.conf; then + log "chaotic-aur + paru already set up — skipping" exit 0 fi diff --git a/run_onchange_30-ensure-cargo.sh.tmpl b/run_onchange_30-ensure-cargo.sh.tmpl index 363f829..24d57fe 100755 --- a/run_onchange_30-ensure-cargo.sh.tmpl +++ b/run_onchange_30-ensure-cargo.sh.tmpl @@ -68,8 +68,13 @@ log "skipping cargo bat install (os_family={{ .os_family }}, pacman handles it)" # - gentoo: topgrade is in GURU overlay. Use emerge. if ! command -v topgrade >/dev/null 2>&1; then {{ if eq .os_family "arch" -}} - log "installing topgrade via pacman (chaotic-aur)" - sudo pacman -S --needed --noconfirm topgrade + if sudo grep -q "^\[chaotic-aur\]" /etc/pacman.conf; then + log "installing topgrade via pacman (chaotic-aur)" + sudo pacman -S --needed --noconfirm topgrade + else + log "chaotic-aur not configured — falling back to cargo install topgrade" + cargo install topgrade --locked + fi {{ else if eq .os_family "debian" -}} log "installing topgrade via cargo (debian has no topgrade package)" cargo install topgrade --locked