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>
61 lines
1.6 KiB
Bash
Executable File
61 lines
1.6 KiB
Bash
Executable File
#!/bin/bash
|
|
set -e
|
|
|
|
# Removes hibernation setup: disables swap, removes swapfile, removes fstab entry,
|
|
# removes resume hook, and removes suspend-then-hibernate configuration.
|
|
|
|
MKINITCPIO_CONF="/etc/mkinitcpio.conf.d/nomarchy_resume.conf"
|
|
|
|
# Check if hibernation is configured
|
|
if [[ ! -f $MKINITCPIO_CONF ]] || ! grep -q "^HOOKS+=(resume)$" "$MKINITCPIO_CONF"; then
|
|
echo "Hibernation is not set up"
|
|
exit 0
|
|
fi
|
|
|
|
if ! gum confirm "Remove hibernation setup?"; then
|
|
exit 0
|
|
fi
|
|
|
|
SWAP_SUBVOLUME="/swap"
|
|
SWAP_FILE="$SWAP_SUBVOLUME/swapfile"
|
|
|
|
# Disable swap if active
|
|
if swapon --show | grep -q "$SWAP_FILE"; then
|
|
echo "Disabling swap on $SWAP_FILE"
|
|
sudo swapoff "$SWAP_FILE"
|
|
fi
|
|
|
|
# Remove swapfile
|
|
if [[ -f $SWAP_FILE ]]; then
|
|
echo "Removing swapfile"
|
|
sudo rm "$SWAP_FILE"
|
|
fi
|
|
|
|
# Remove swap subvolume
|
|
if sudo btrfs subvolume show "$SWAP_SUBVOLUME" &>/dev/null; then
|
|
echo "Removing Btrfs subvolume $SWAP_SUBVOLUME"
|
|
sudo btrfs subvolume delete "$SWAP_SUBVOLUME"
|
|
fi
|
|
|
|
# Remove fstab entry
|
|
if grep -Fq "$SWAP_FILE" /etc/fstab; then
|
|
echo "Removing swapfile from /etc/fstab"
|
|
sudo cp -a /etc/fstab "/etc/fstab.$(date +%Y%m%d%H%M%S).back"
|
|
sudo sed -i "\|$SWAP_FILE|d" /etc/fstab
|
|
sudo sed -i '/^# Btrfs swapfile for system hibernation$/d' /etc/fstab
|
|
fi
|
|
|
|
# Remove suspend-then-hibernate configuration
|
|
echo "Removing suspend-then-hibernate configuration"
|
|
sudo rm -f /etc/systemd/logind.conf.d/lid.conf
|
|
sudo rm -f /etc/systemd/sleep.conf.d/hibernate.conf
|
|
|
|
# Remove mkinitcpio resume hook
|
|
echo "Removing resume hook"
|
|
sudo rm "$MKINITCPIO_CONF"
|
|
|
|
echo "Regenerating initramfs..."
|
|
sudo limine-mkinitcpio
|
|
|
|
echo "Hibernation removed"
|