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>
58 lines
1.6 KiB
Bash
Executable File
58 lines
1.6 KiB
Bash
Executable File
#!/bin/bash
|
|
set -e
|
|
|
|
# Launch the Nomarchy screensaver in the default terminal on the system with the correct font configuration.
|
|
|
|
# Exit early if we don't have the tte show
|
|
if ! command -v tte &>/dev/null; then
|
|
exit 1
|
|
fi
|
|
|
|
# Exit early if screensave is already running
|
|
pgrep -f org.nomarchy.screensaver && exit 0
|
|
|
|
# Allow screensaver to be turned off but also force started
|
|
# Skip if screensaver is disabled in configuration
|
|
if [[ $NNOMARCHY_TOGGLE_SCREENSAVER == "false" ]] && [[ $1 != "force" ]]; then
|
|
exit 0
|
|
fi
|
|
|
|
|
|
# Silently quit Walker on overlay
|
|
walker -q
|
|
|
|
focused=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true).name')
|
|
terminal=$(xdg-terminal-exec --print-id)
|
|
|
|
for m in $(hyprctl monitors -j | jq -r '.[] | .name'); do
|
|
hyprctl dispatch focusmonitor $m
|
|
|
|
case $terminal in
|
|
*Alacritty*)
|
|
hyprctl dispatch exec -- \
|
|
alacritty --class=org.nomarchy.screensaver \
|
|
--config-file ~/.local/share/nomarchy/default/alacritty/screensaver.toml \
|
|
-e nomarchy-cmd-screensaver
|
|
;;
|
|
*ghostty*)
|
|
hyprctl dispatch exec -- \
|
|
ghostty --class=org.nomarchy.screensaver \
|
|
--config-file=~/.local/share/nomarchy/default/ghostty/screensaver \
|
|
--font-size=18 \
|
|
-e nomarchy-cmd-screensaver
|
|
;;
|
|
*kitty*)
|
|
hyprctl dispatch exec -- \
|
|
kitty --class=org.nomarchy.screensaver \
|
|
--override font_size=18 \
|
|
--override window_padding_width=0 \
|
|
-e nomarchy-cmd-screensaver
|
|
;;
|
|
*)
|
|
notify-send -u low "✋ Screensaver only runs in Alacritty, Ghostty, or Kitty"
|
|
;;
|
|
esac
|
|
done
|
|
|
|
hyprctl dispatch focusmonitor $focused
|