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>
46 lines
1.6 KiB
Bash
46 lines
1.6 KiB
Bash
#!/bin/bash
|
|
set -e
|
|
|
|
# nomarchy-refresh-config: Restore a specific configuration file to its stock version.
|
|
# Usage: nomarchy-refresh-config <relative-path-to-config>
|
|
# Example: nomarchy-refresh-config hypr/hyprland.conf
|
|
|
|
CONFIG_FILE=$1
|
|
|
|
if [[ -z $CONFIG_FILE ]]; then
|
|
echo "Usage: nomarchy-refresh-config <config-path>"
|
|
exit 1
|
|
fi
|
|
|
|
# Determine source directory (where stock configs are stored)
|
|
# In Nomarchy, we deploy them via Nix, but we also keep a copy in local share for easy access
|
|
STOCK_DIR="$HOME/.local/share/nomarchy/themes" # Fallback if specific config isn't themed
|
|
# Wait, actually we should use the one from /etc/nixos if available
|
|
STOCK_BASE="/etc/nixos/nomarchy/core/home/config"
|
|
|
|
if [ ! -d "$STOCK_BASE" ]; then
|
|
# Fallback to local share if /etc/nixos is not available
|
|
STOCK_BASE="$HOME/.local/share/nomarchy/config"
|
|
fi
|
|
|
|
SOURCE_FILE="$STOCK_BASE/$CONFIG_FILE"
|
|
DEST_FILE="$HOME/.config/$CONFIG_FILE"
|
|
|
|
if [ ! -f "$SOURCE_FILE" ]; then
|
|
# Try searching in features/ as well
|
|
STOCK_BASE="/etc/nixos/nomarchy/features"
|
|
# Find the file in features
|
|
SOURCE_FILE=$(find "$STOCK_BASE" -name "$(basename "$CONFIG_FILE")" | head -n 1)
|
|
fi
|
|
|
|
if [[ -n $SOURCE_FILE ]] && [[ -f "$SOURCE_FILE" ]]; then
|
|
echo "Refreshing $DEST_FILE from stock $SOURCE_FILE..."
|
|
mkdir -p "$(dirname "$DEST_FILE")"
|
|
cp "$SOURCE_FILE" "$DEST_FILE"
|
|
notify-send "Config Refreshed" "$CONFIG_FILE has been restored to defaults."
|
|
else
|
|
echo "Error: Stock configuration for $CONFIG_FILE not found."
|
|
notify-send -u critical "Error" "Stock configuration for $CONFIG_FILE not found."
|
|
exit 1
|
|
fi
|