1e9481849b
Sweep across the three script directories: features/scripts/utils,
core/system/scripts, themes/engine/scripts. 142 of 169 bash scripts
gained `set -e`; 27 already had it; the one Python helper
(nomarchy-haptic-touchpad) was skipped via shebang detection.
Why: bash's default behavior is to continue past a failed command,
which means a script that does "do A; do B; do C" leaves the system
in a half-applied state when B fails - and the user gets no signal.
Several recent fix commits (theme partial-apply, waybar reload race,
installer prewipe silent failures) all trace back to this. set -e
turns silent corruption into a loud abort the user can act on.
The 11 scripts with explicit `|| true` markers stay safe under set -e
because || true coerces the exit to zero; the markers continue to
mean "I deliberately tolerate this failure here."
Deliberate exception: nomarchy-menu runs WITHOUT set -e. It is an
interactive UX loop where action branches do `cmd; back_to <self>`
so a failed action would abort the script under set -e and the menu
would disappear without feedback. Soft-failure - menu re-displays,
user picks again - is the right semantic. Documented inline.
Validation: bash -n on every modified script (zero failures). The
new pre-commit hook (27f5663) was just updated to filter by shebang
so it doesn't try to bash-syntax-check the Python helper - that
filter was uncovered by this sweep.
Risk: set -e can surface latent bugs in scripts that previously
relied on silent continuation. If anything breaks, it's a real bug
that was already broken and is now visible. Easy per-script revert
if any UX glitches show up.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
40 lines
1010 B
Bash
Executable File
40 lines
1010 B
Bash
Executable File
#!/usr/bin/env bash
|
|
set -e
|
|
|
|
# Set the system-wide monospace font that should be used by the terminal, hyprlock, waybar, swayosd, etc.
|
|
# Declarative version for Nomarchy NixOS.
|
|
|
|
font_name="$1"
|
|
|
|
if [[ -z $font_name ]]; then
|
|
echo "Usage: nomarchy-font-set <font-name>"
|
|
exit 1
|
|
fi
|
|
|
|
STATE_DIR="$HOME/.config/nomarchy"
|
|
STATE_FILE="$STATE_DIR/state.json"
|
|
|
|
mkdir -p "$STATE_DIR"
|
|
[[ ! -f $STATE_FILE ]] && echo "{}" > "$STATE_FILE"
|
|
|
|
if fc-list | grep -iq "$font_name"; then
|
|
TMP_JSON=$(mktemp)
|
|
jq --arg font "$font_name" '.font = $font' "$STATE_FILE" > "$TMP_JSON" && mv "$TMP_JSON" "$STATE_FILE"
|
|
echo "Font set to $font_name declaratively. Applying changes..."
|
|
nomarchy-env-update
|
|
|
|
# Instant feedback for certain apps via IPC
|
|
if pgrep -x kitty; then
|
|
pkill -USR1 kitty
|
|
fi
|
|
if pgrep -x ghostty; then
|
|
pkill -SIGUSR2 ghostty
|
|
notify-send -u low " You must restart Ghostty to see font change"
|
|
fi
|
|
|
|
nomarchy-hook font-set "$font_name"
|
|
else
|
|
echo "Font '$font_name' not found."
|
|
exit 1
|
|
fi
|