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>
31 lines
1.0 KiB
Bash
Executable File
31 lines
1.0 KiB
Bash
Executable File
#!/bin/bash
|
|
set -e
|
|
|
|
# Walker (with runAsService = true) and elephant are Home Manager user
|
|
# services. Restart via systemd so the new process inherits the full graphical
|
|
# session environment — the pkill/uwsm-app dance left a window where the
|
|
# launcher would come back up with stale theming.
|
|
|
|
restart_services() {
|
|
if systemctl --user list-unit-files elephant.service >/dev/null 2>&1; then
|
|
systemctl --user restart elephant.service
|
|
fi
|
|
|
|
if systemctl --user list-unit-files walker.service >/dev/null 2>&1; then
|
|
systemctl --user restart walker.service
|
|
elif systemctl --user is-enabled app-walker@autostart.service &>/dev/null; then
|
|
systemctl --user restart app-walker@autostart.service
|
|
else
|
|
echo -e "\e[31mUnable to restart Walker -- RESTART MANUALLY\e[0m"
|
|
fi
|
|
}
|
|
|
|
if (( EUID == 0 )); then
|
|
SCRIPT_OWNER=$(stat -c '%U' "$0")
|
|
USER_UID=$(id -u "$SCRIPT_OWNER")
|
|
systemd-run --uid="$SCRIPT_OWNER" --setenv=XDG_RUNTIME_DIR="/run/user/$USER_UID" \
|
|
bash -c "$(declare -f restart_services); restart_services"
|
|
else
|
|
restart_services
|
|
fi
|