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>
102 lines
2.6 KiB
Bash
Executable File
102 lines
2.6 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
set -e
|
|
# Nomarchy Atomic State Write Helper
|
|
# Provides atomic JSON state updates with flock to prevent race conditions
|
|
#
|
|
# Usage:
|
|
# nomarchy-state-write <key> <value> [--type string|bool|number|json]
|
|
# nomarchy-state-write --file <path> <key> <value> [--type ...]
|
|
#
|
|
# Examples:
|
|
# nomarchy-state-write theme "nord"
|
|
# nomarchy-state-write idle true --type bool
|
|
# nomarchy-state-write hyprland '{"gaps_in": 5}' --type json
|
|
# nomarchy-state-write --file /etc/nixos/state.json dns "Cloudflare"
|
|
|
|
set -e
|
|
|
|
# Default state file
|
|
STATE_FILE="$HOME/.config/nomarchy/state.json"
|
|
VALUE_TYPE="string"
|
|
|
|
# Parse arguments
|
|
while [[ $# -gt 0 ]]; do
|
|
case $1 in
|
|
--file)
|
|
STATE_FILE="$2"
|
|
shift 2
|
|
;;
|
|
--type)
|
|
VALUE_TYPE="$2"
|
|
shift 2
|
|
;;
|
|
*)
|
|
if [[ -z "$KEY" ]]; then
|
|
KEY="$1"
|
|
elif [[ -z "$VALUE" ]]; then
|
|
VALUE="$1"
|
|
fi
|
|
shift
|
|
;;
|
|
esac
|
|
done
|
|
|
|
if [[ -z "$KEY" ]] || [[ -z "$VALUE" ]]; then
|
|
echo "Usage: nomarchy-state-write <key> <value> [--type string|bool|number|json]"
|
|
echo " nomarchy-state-write --file <path> <key> <value> [--type ...]"
|
|
exit 1
|
|
fi
|
|
|
|
# Ensure directory exists
|
|
mkdir -p "$(dirname "$STATE_FILE")"
|
|
|
|
# Initialize file if it doesn't exist
|
|
[[ ! -f "$STATE_FILE" ]] && echo "{}" > "$STATE_FILE"
|
|
|
|
# Create lock file path
|
|
LOCK_FILE="${STATE_FILE}.lock"
|
|
|
|
# Perform atomic update with flock
|
|
(
|
|
flock -x 200
|
|
|
|
TMP_FILE=$(mktemp)
|
|
trap "rm -f '$TMP_FILE'" EXIT
|
|
|
|
case "$VALUE_TYPE" in
|
|
string)
|
|
jq --arg val "$VALUE" ".$KEY = \$val" "$STATE_FILE" > "$TMP_FILE"
|
|
;;
|
|
bool)
|
|
if [[ "$VALUE" == "true" ]] || [[ "$VALUE" == "false" ]]; then
|
|
jq --argjson val "$VALUE" ".$KEY = \$val" "$STATE_FILE" > "$TMP_FILE"
|
|
else
|
|
echo "Error: Boolean value must be 'true' or 'false'"
|
|
exit 1
|
|
fi
|
|
;;
|
|
number)
|
|
jq --argjson val "$VALUE" ".$KEY = \$val" "$STATE_FILE" > "$TMP_FILE"
|
|
;;
|
|
json)
|
|
jq --argjson val "$VALUE" ".$KEY = \$val" "$STATE_FILE" > "$TMP_FILE"
|
|
;;
|
|
*)
|
|
echo "Error: Unknown type '$VALUE_TYPE'. Use string, bool, number, or json."
|
|
exit 1
|
|
;;
|
|
esac
|
|
|
|
# Validate JSON before moving
|
|
if jq empty "$TMP_FILE" 2>/dev/null; then
|
|
mv "$TMP_FILE" "$STATE_FILE"
|
|
else
|
|
echo "Error: Failed to generate valid JSON"
|
|
exit 1
|
|
fi
|
|
|
|
) 200>"$LOCK_FILE"
|
|
|
|
# Clean up lock file
|
|
rm -f "$LOCK_FILE"
|