Make run_once scripts sudo-prompt-free when packages already present
Several run_once scripts unconditionally called sudo pacman/apt to install packages — even on boxes where every package was already present. That triggered a sudo password prompt on every fresh chezmoi apply for nothing. Two changes: 1. .chezmoi.yaml.tmpl: fall back to ~/.local/bin/age if /usr/bin/age isn't installed (matters during initial bootstrap before age is installed system-wide). 2. run_once_*.sh.tmpl: detect missing packages first; only call sudo if there's actually something to install. For the LAN hosts script, detect the existing block and skip if it's already correct. These changes are transparent on boxes that already had everything installed (the existing 5): no behavior change. They reduce sudo prompts on bit (the new box, where most packages are pre-installed) from ~5 prompts to 1 (just for /etc/hosts).
This commit is contained in:
parent
a2cc669b22
commit
b40d724f6c
5 changed files with 109 additions and 33 deletions
|
|
@ -36,14 +36,28 @@ SWAY_PKGS+=(dunst)
|
|||
log "WARNING: sway packages not configured for os_family={{ .os_family }}"
|
||||
{{ end -}}
|
||||
|
||||
log "installing sway stack: ${SWAY_PKGS[*]}"
|
||||
log "checking sway stack: ${SWAY_PKGS[*]}"
|
||||
|
||||
{{ if eq .os_family "arch" -}}
|
||||
sudo pacman -S --needed --noconfirm "${SWAY_PKGS[@]}"
|
||||
{{ else if eq .os_family "debian" -}}
|
||||
export DEBIAN_FRONTEND=noninteractive
|
||||
sudo apt-get install -y --no-install-recommends "${SWAY_PKGS[@]}"
|
||||
{{ end -}}
|
||||
# Only invoke sudo if any of the packages are missing. Bit has most
|
||||
# already; byte/kaiser are full. This avoids a no-op sudo prompt.
|
||||
MISSING_PKGS=()
|
||||
for p in "${SWAY_PKGS[@]}"; do
|
||||
if ! command -v "$p" >/dev/null 2>&1; then
|
||||
MISSING_PKGS+=("$p")
|
||||
fi
|
||||
done
|
||||
|
||||
if (( ${#MISSING_PKGS[@]} > 0 )); then
|
||||
log "missing: ${MISSING_PKGS[*]}"
|
||||
{{ if eq .os_family "arch" -}}
|
||||
sudo pacman -S --needed --noconfirm "${MISSING_PKGS[@]}"
|
||||
{{ else if eq .os_family "debian" -}}
|
||||
export DEBIAN_FRONTEND=noninteractive
|
||||
sudo apt-get install -y --no-install-recommends "${MISSING_PKGS[@]}"
|
||||
{{ end -}}
|
||||
else
|
||||
log "all sway packages already installed; skipping"
|
||||
fi
|
||||
|
||||
log "sway stack installed"
|
||||
sway --version 2>&1 | head -1
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue