rain/gnu-plus-dotfiles
rain/gnu-plus-dotfiles
1
0
Fork 0
Code Wiki Activity

Move bat cargo install from run_once_20 to run_onchange_30

Browse source 
run_once_20 runs BEFORE run_onchange_30 in the bootstrap chain, so
'command -v cargo' inside run_once_20 was always false on a fresh
box — cargo install bat was skipped, leaving bat missing on debian.

Move the bat install to run_onchange_30 (which runs last, after
rustup is installed). Restructure the script to:
1. Ensure cargo is installed (existing logic)
2. Install bat via cargo on debian only (new logic, gated by os_family)

This way the bootstrap chain becomes:
  run_once_00 -> run_once_10 -> run_once_20 (apt packages, neovim, oh-my-zsh, font)
  -> run_onchange_30 (rustup, then bat from crates.io)

Crouton currently has rustup installed but no bat (cargo install
in progress in background). Re-running chezmoi init will skip
run_once_20 (state recorded) and re-run run_onchange_30 (content
changed), which will see bat missing and trigger cargo install
automatically.
This commit is contained in:
Rain 2026-06-21 22:50:08 -04:00
parent b731141f5a
commit 06d5826035
2 changed files with 34 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

9
run_once_20-install-user-packages.sh.tmpl
View file

@ -64,13 +64,8 @@ if command -v fdfind >/dev/null 2>&1 && ! command -v fd >/dev/null 2>&1; then
fi fi
# Debian ships 'bat' as 'batcat' due to a name clash with an unrelated # Debian ships 'bat' as 'batcat' due to a name clash with an unrelated
# package. Install upstream 'bat' via cargo so we get the real binary at # package. The install happens in run_onchange_30 (after rustup is ready,
# $HOME/.cargo/bin/bat. Faster than apt's renamed package, version-aligned # via `cargo install bat`).
# with arch's pacman install.
if command -v cargo >/dev/null 2>&1 && ! command -v bat >/dev/null 2>&1; then
log "installing bat via cargo (upstream, debian renames it to batcat)"
cargo install bat --locked 2>&1 | tail -5
fi
# Neovim — install official binary tarball, pinned to a known-good version. # Neovim — install official binary tarball, pinned to a known-good version.
# Bump NVIM_TARGET_VERSION to upgrade. ~/.local/bin/update-neovim.sh does # Bump NVIM_TARGET_VERSION to upgrade. ~/.local/bin/update-neovim.sh does

47
run_onchange_30-ensure-cargo.sh.tmpl
View file

@ -2,6 +2,9 @@
# ============================================================================= # =============================================================================
# run_onchange_30-ensure-cargo.sh.tmpl # run_onchange_30-ensure-cargo.sh.tmpl
# Make sure rustup/cargo is available. If not, install rustup. # Make sure rustup/cargo is available. If not, install rustup.
# After cargo is ready, install bat from crates.io on debian (apt renames
# upstream bat to batcat, which breaks .zshrc's `alias cat=bat`).
#
# Runs on every apply because the script body rarely changes but we want a # Runs on every apply because the script body rarely changes but we want a
# fresh check after package installs. # fresh check after package installs.
# ============================================================================= # =============================================================================
@ -9,21 +12,35 @@ set -euo pipefail
log() { printf '\033[1;34m[cargo]\033[0m %s\n' "$*"; } log() { printf '\033[1;34m[cargo]\033[0m %s\n' "$*"; }
if command -v cargo >/dev/null 2>&1; then # --- 1. Ensure cargo is on PATH ---
log "cargo already installed: $(cargo --version)" if ! command -v cargo >/dev/null 2>&1; then
exit 0 if command -v rustup >/dev/null 2>&1; then
log "rustup present but cargo missing — running rustup default"
rustup default stable
else
log "no cargo or rustup — installing rustup"
sh -c "$(curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs)" -- -y --default-toolchain stable --profile minimal
# shellcheck disable=SC1091
source "$HOME/.cargo/env"
fi
fi fi
if command -v rustup >/dev/null 2>&1; then # Ensure subsequent commands in this script can find cargo
log "rustup present but cargo missing — running rustup default" export PATH="$HOME/.cargo/bin:$PATH"
rustup default stable
exit 0 log "rustup installed: $(rustup --version 2>/dev/null || echo unknown)"
log "cargo installed: $(cargo --version)"
# --- 2. Install bat from crates.io if missing (debian only) ---
{{ if eq .os_family "debian" -}}
if ! command -v bat >/dev/null 2>&1; then
log "installing bat via cargo (upstream, debian renames it to batcat)"
cargo install bat --locked
log "bat installed: $(bat --version)"
else
log "bat already installed: $(bat --version)"
fi fi
{{ else -}}
log "no cargo or rustup — installing rustup" # Arch already installs upstream bat via pacman; nothing extra to do.
sh -c "$(curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs)" -- -y --default-toolchain stable --profile minimal log "skipping cargo bat install (os_family={{ .os_family }}, pacman handles it)"
# shellcheck disable=SC1091 {{ end -}}
source "$HOME/.cargo/env"
log "rustup installed: $(rustup --version)"
log "cargo installed: $(cargo --version)"