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>
43 lines
1.6 KiB
Bash
43 lines
1.6 KiB
Bash
#!/bin/bash
|
|
set -e
|
|
|
|
# Wrapper to launch walker with elephant provider, or fallback to rofi if walker is missing.
|
|
|
|
if command -v walker >/dev/null 2>&1; then
|
|
# The setsid backgrounded commands below MUST redirect all std fds to
|
|
# /dev/null. If they inherit stdout from a $(...) caller (e.g. nomarchy-menu
|
|
# doing `$(menu ...)`), bash waits for those fds to close on every return,
|
|
# which hangs the terminal after each menu selection.
|
|
if ! pgrep -x elephant > /dev/null; then
|
|
setsid uwsm-app -- elephant </dev/null >/dev/null 2>&1 &
|
|
disown
|
|
fi
|
|
|
|
if ! pgrep -f "walker --gapplication-service" > /dev/null; then
|
|
setsid uwsm-app -- walker --gapplication-service </dev/null >/dev/null 2>&1 &
|
|
disown
|
|
fi
|
|
|
|
# dmenu mode reads stdin and is invoked many times in quick succession
|
|
# by nomarchy-menu. Wrapping each call in uwsm-app (systemd-run --scope)
|
|
# creates a fresh transient scope per invocation, which breaks chained
|
|
# submenus — subsequent walker calls don't see a usable stdin and exit
|
|
# without showing anything. Invoke walker directly for dmenu.
|
|
if [[ "$*" == *"--dmenu"* ]]; then
|
|
exec walker "$@"
|
|
fi
|
|
|
|
exec uwsm-app -- walker --width 644 --maxheight 300 --minheight 300 "$@"
|
|
elif command -v rofi >/dev/null 2>&1; then
|
|
# Convert walker arguments to rofi arguments if possible
|
|
# This is a very basic mapping for --dmenu
|
|
if [[ "$*" == *"--dmenu"* ]]; then
|
|
exec rofi -dmenu "$@"
|
|
else
|
|
exec rofi -show drun
|
|
fi
|
|
else
|
|
notify-send "Error" "Neither walker nor rofi found." -u critical
|
|
exit 1
|
|
fi
|