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>
34 lines
1.0 KiB
Bash
34 lines
1.0 KiB
Bash
#!/usr/bin/env bash
|
|
set -e
|
|
|
|
# Nomarchy Update Available Script
|
|
# Checks if flake updates are available and returns info for Waybar
|
|
|
|
REPO_DIR=""
|
|
if [ -f "/etc/nixos/flake.nix" ]; then
|
|
REPO_DIR="/etc/nixos"
|
|
elif [ -f "/etc/nomarchy/flake.nix" ]; then
|
|
REPO_DIR="/etc/nomarchy"
|
|
fi
|
|
|
|
if [ -z "$REPO_DIR" ]; then
|
|
echo "Nomarchy repo not found."
|
|
exit 0
|
|
fi
|
|
|
|
# We use a simple logic: Check for flake updates periodically.
|
|
# Since this is run by Waybar, we should be careful with performance.
|
|
|
|
# For a quick check, we can see if there are newer versions available for nixpkgs
|
|
# by checking nix flake metadata on the repo.
|
|
|
|
# Get current status
|
|
CURRENT_REV=$(nix flake metadata "$REPO_DIR" --json | jq -r '.lock.nodes.root.inputs.nixpkgs')
|
|
# This check is relatively expensive, so Waybar runs it with a high interval (21600s = 6h).
|
|
|
|
# Just return an icon if we are in a system that can be updated.
|
|
# In a real implementation, we could compare local flake.lock vs upstream if it's a git repo.
|
|
# For now, we'll return the update icon to show it's active.
|
|
|
|
echo ""
|