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
|
|
@ -37,7 +37,17 @@ age:
|
|||
# Arch's pacman and Debian's apt both put it there. Using the absolute
|
||||
# path means chezmoi can find age even if PATH isn't set correctly
|
||||
# (which happens in some non-interactive SSH contexts).
|
||||
#
|
||||
# On a per-machine bootstrap, this might not be installed yet (sudo
|
||||
# required). The bootstrap detects the fallback path and re-renders
|
||||
# the config to use it. See run_once_00-install-bootstrap-tools.sh.tmpl.
|
||||
{{- if stat "/usr/bin/age" }}
|
||||
command: "/usr/bin/age"
|
||||
{{- else if stat (joinPath .chezmoi.homeDir ".local/bin/age") }}
|
||||
command: "{{ joinPath .chezmoi.homeDir ".local/bin/age" }}"
|
||||
{{- else if stat "/usr/local/bin/age" }}
|
||||
command: "/usr/local/bin/age"
|
||||
{{- end }}
|
||||
identity: "~/.config/chezmoi/key.txt"
|
||||
|
||||
# Multiple recipients: every listed recipient can decrypt every *.age file.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue