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>
47 lines
1.3 KiB
Bash
Executable File
47 lines
1.3 KiB
Bash
Executable File
#!/bin/bash
|
|
set -e
|
|
|
|
# Add an EFI boot entry for the Nomarchy UKI, allowing the system to boot directly
|
|
# without a bootloader like Limine. Requires UEFI firmware and a built UKI.
|
|
|
|
if [[ ! -d /sys/firmware/efi ]]; then
|
|
echo "Error: System is not booted in UEFI mode" >&2
|
|
exit 1
|
|
fi
|
|
|
|
if ! efibootmgr &>/dev/null; then
|
|
echo "Error: efibootmgr is not available or not functional" >&2
|
|
exit 1
|
|
fi
|
|
|
|
if cat /sys/class/dmi/id/bios_vendor 2>/dev/null | grep -qi "American Megatrends"; then
|
|
echo "Error: American Megatrends firmware may not safely support custom EFI entries" >&2
|
|
exit 1
|
|
fi
|
|
|
|
if cat /sys/class/dmi/id/bios_vendor 2>/dev/null | grep -qi "Apple"; then
|
|
echo "Error: Apple firmware uses its own boot manager" >&2
|
|
exit 1
|
|
fi
|
|
|
|
uki_file=$(find /boot/EFI/Linux/ -name "nomarchy*.efi" -printf "%f\n" 2>/dev/null | head -1)
|
|
|
|
if [[ -z $uki_file ]]; then
|
|
echo "Error: No Nomarchy UKI found in /boot/EFI/Linux/" >&2
|
|
exit 1
|
|
fi
|
|
|
|
boot_source=$(findmnt -n -o SOURCE /boot)
|
|
disk=$(echo "$boot_source" | sed 's/p\?[0-9]*$//')
|
|
part=$(echo "$boot_source" | grep -o 'p\?[0-9]*$' | sed 's/^p//')
|
|
|
|
if gum confirm "Setup direct boot (so snapshot booting must be done via bios)?"; then
|
|
echo "Creating EFI boot entry for $uki_file"
|
|
|
|
sudo efibootmgr --create \
|
|
--disk "$disk" \
|
|
--part "$part" \
|
|
--label "Nomarchy" \
|
|
--loader "\\EFI\\Linux\\$uki_file"
|
|
fi
|