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>
38 lines
1.0 KiB
Bash
Executable File
38 lines
1.0 KiB
Bash
Executable File
#!/bin/bash
|
|
set -e
|
|
|
|
# Run the Nomarchy screensaver using random effects from TTE.
|
|
|
|
screensaver_in_focus() {
|
|
hyprctl activewindow -j | jq -e '.class == "org.nomarchy.screensaver"' >/dev/null 2>&1
|
|
}
|
|
|
|
exit_screensaver() {
|
|
hyprctl keyword cursor:invisible false &>/dev/null || true
|
|
pkill -x tte 2>/dev/null
|
|
pkill -f org.nomarchy.screensaver 2>/dev/null
|
|
exit 0
|
|
}
|
|
|
|
# Exit the screensaver on signals and input from keyboard and mouse
|
|
trap exit_screensaver SIGINT SIGTERM SIGHUP SIGQUIT
|
|
|
|
printf '\033]11;rgb:00/00/00\007' # Set background color to black
|
|
|
|
hyprctl keyword cursor:invisible true &>/dev/null
|
|
|
|
tty=$(tty 2>/dev/null)
|
|
|
|
while true; do
|
|
tte -i ~/.config/nomarchy/branding/logo.txt \
|
|
--frame-rate 120 --canvas-width 0 --canvas-height 0 --reuse-canvas --anchor-canvas c --anchor-text c\
|
|
--random-effect --exclude-effects dev_worm \
|
|
--no-eol --no-restore-cursor &
|
|
|
|
while pgrep -t "${tty#/dev/}" -x tte >/dev/null; do
|
|
if read -n1 -t 1 || ! screensaver_in_focus; then
|
|
exit_screensaver
|
|
fi
|
|
done
|
|
done
|