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>
101 lines
3.4 KiB
Bash
Executable File
101 lines
3.4 KiB
Bash
Executable File
#!/bin/bash
|
|
set -e
|
|
|
|
# Creates a swap file in the btrfs subvolume, adds the swap file to /etc/fstab,
|
|
# adds a resume hook to mkinitcpio, and configures suspend-then-hibernate.
|
|
|
|
if [[ ! -f /sys/power/image_size ]]; then
|
|
echo -e "Hibernation is not supported on your system" >&2
|
|
exit 0
|
|
fi
|
|
|
|
if ! command -v limine-mkinitcpio &>/dev/null; then
|
|
echo "Skipping hibernation setup (requires Limine bootloader)"
|
|
exit 0
|
|
fi
|
|
|
|
MKINITCPIO_CONF="/etc/mkinitcpio.conf.d/nomarchy_resume.conf"
|
|
|
|
# Check if hibernation is already configured
|
|
if [[ -f $MKINITCPIO_CONF ]] && grep -q "^HOOKS+=(resume)$" "$MKINITCPIO_CONF"; then
|
|
echo "Hibernation is already set up"
|
|
exit 0
|
|
fi
|
|
|
|
if [[ $1 != "--force" ]]; then
|
|
MEM_TOTAL_HUMAN=$(free --human | awk '/Mem/ {print $2}')
|
|
if ! gum confirm "Use $MEM_TOTAL_HUMAN on boot drive to make hibernation available?"; then
|
|
exit 0
|
|
fi
|
|
fi
|
|
|
|
SWAP_SUBVOLUME="/swap"
|
|
SWAP_FILE="$SWAP_SUBVOLUME/swapfile"
|
|
|
|
# Create btrfs subvolume for swap
|
|
if ! sudo btrfs subvolume show "$SWAP_SUBVOLUME" &>/dev/null; then
|
|
echo "Creating Btrfs subvolume"
|
|
sudo btrfs subvolume create "$SWAP_SUBVOLUME"
|
|
sudo chattr +C "$SWAP_SUBVOLUME"
|
|
fi
|
|
|
|
# Create swapfile
|
|
if ! sudo swaplabel "$SWAP_FILE" &>/dev/null; then
|
|
echo "Creating swapfile in Btrfs subvolume"
|
|
MEM_TOTAL_KB="$(awk '/MemTotal/ {print $2}' /proc/meminfo)k"
|
|
sudo btrfs filesystem mkswapfile -s "$MEM_TOTAL_KB" "$SWAP_FILE"
|
|
fi
|
|
|
|
# Add swapfile to fstab
|
|
if ! grep -Fq "$SWAP_FILE" /etc/fstab; then
|
|
echo "Adding swapfile to /etc/fstab"
|
|
sudo cp -a /etc/fstab "/etc/fstab.$(date +%Y%m%d%H%M%S).back"
|
|
printf "\n# Btrfs swapfile for system hibernation\n%s none swap defaults,pri=0 0 0\n" "$SWAP_FILE" | sudo tee -a /etc/fstab >/dev/null
|
|
fi
|
|
|
|
# Enable swap
|
|
if ! swapon --show | grep -q "$SWAP_FILE"; then
|
|
echo "Enabling swap on $SWAP_FILE"
|
|
sudo swapon -p 0 "$SWAP_FILE"
|
|
fi
|
|
|
|
# Add resume hook to mkinitcpio
|
|
sudo mkdir -p /etc/mkinitcpio.conf.d
|
|
echo "Adding resume hook to $MKINITCPIO_CONF"
|
|
echo "HOOKS+=(resume)" | sudo tee "$MKINITCPIO_CONF" >/dev/null
|
|
|
|
# Add resume= kernel parameters so the initramfs resume hook knows where to find the
|
|
# hibernation image. Without these, resume happens late (after GPU drivers load) and fails.
|
|
RESUME_DROP_IN="/etc/limine-entry-tool.d/resume.conf"
|
|
if [[ ! -f $RESUME_DROP_IN ]]; then
|
|
echo "Adding resume kernel parameters"
|
|
sudo swapon -p 0 "$SWAP_FILE" 2>/dev/null
|
|
RESUME_DEVICE=$(findmnt -no SOURCE -T "$SWAP_FILE" | sed 's/\[.*\]//')
|
|
RESUME_OFFSET=$(sudo btrfs inspect-internal map-swapfile -r "$SWAP_FILE")
|
|
sudo mkdir -p /etc/limine-entry-tool.d
|
|
echo "KERNEL_CMDLINE[default]+=\" resume=$RESUME_DEVICE resume_offset=$RESUME_OFFSET\"" | sudo tee "$RESUME_DROP_IN" >/dev/null
|
|
sudo tee -a /etc/default/limine < "$RESUME_DROP_IN" >/dev/null
|
|
fi
|
|
|
|
# Use ACPI alarm for RTC wakeup on s2idle systems (needed for suspend-then-hibernate)
|
|
if grep -q "\[s2idle\]" /sys/power/mem_sleep 2>/dev/null; then
|
|
LIMINE_DROP_IN="/etc/limine-entry-tool.d/rtc-alarm.conf"
|
|
if [[ ! -f $LIMINE_DROP_IN ]]; then
|
|
echo "Enabling ACPI RTC alarm for s2idle suspend"
|
|
sudo mkdir -p /etc/limine-entry-tool.d
|
|
echo 'KERNEL_CMDLINE[default]+=" rtc_cmos.use_acpi_alarm=1"' | sudo tee "$LIMINE_DROP_IN" >/dev/null
|
|
sudo tee -a /etc/default/limine < "$LIMINE_DROP_IN" >/dev/null
|
|
fi
|
|
fi
|
|
|
|
# Regenerate initramfs and boot entry
|
|
echo "Regenerating initramfs..."
|
|
sudo limine-mkinitcpio
|
|
sudo limine-update
|
|
|
|
echo
|
|
|
|
if [[ $1 != "--force" ]] && gum confirm "Reboot to enable hibernation?"; then
|
|
nomarchy-system-reboot
|
|
fi
|