ZacharyZhang-NY/omarchycn
4
5
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases 5 Wiki Activity

Simplify finalize.sh and install.sh's preflight ownership

Browse Source 
finalize.sh just does the in-target work: env setup, source helpers,
mark current migrations as done (idempotent), run packaging/config/
login/post-install. No preflight orchestration, no install_mode_is
offline branches.

install.sh (online) inlines the preflight bits that are online-specific:
guard.sh, begin.sh, show-env.sh. The first-run-mode setup that used to
live in preflight (offline-only) moves to an orchestrator phase in a
later chunk; disable-mkinitcpio.sh is obsolete entirely because the C3
phase ordering means the limine UKI hook fires exactly once with
correct config in place.

install/preflight/{all,disable-mkinitcpio,first-run-mode}.sh still
exist on disk but are no longer sourced. They'll get removed in a
later chunk once the orchestrator absorbs first-run-mode.
This commit is contained in:
Ryan Hughes
2026-06-04 18:34:35 -04:00
parent 2beda6abed
commit df645a202d
2 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install.sh
+15 -16
View File
@@ -1,12 +1,12 @@
#!/bin/bash
#
# Online install entry point. Run by the user on an existing system to install
# / refresh Omarchy. Ensures the omarchy runtime + omarchy-base.packages set
# is up to date, then hands off to finalize.sh for the actual configure work.
# Online install entry point. Run by the user on an existing Arch system to
# install / refresh Omarchy. Guards the host, ensures the omarchy runtime is
# up to date, then hands off to finalize.sh for the actual configure work.
#
# Offline installs (from the ISO) skip this script entirely: the Python
# orchestrator handles partitioning, base install, package install, then calls
# finalize.sh directly inside the chroot.
# orchestrator owns disk, base, bootloader, and package install before calling
# finalize.sh directly in the chroot.
set -eEo pipefail
@@ -22,18 +22,17 @@ export_legacy_mode_flags
source "$OMARCHY_INSTALL/helpers/all.sh"
# The finalize scripts assume the omarchy runtime + the default install set are
# already on disk. In online mode we install them here; offline mode asserts
# (the orchestrator pacstraps them before calling finalize.sh directly).
# Online-only setup: sanity-check the host, show the logo, start capturing
# the install log to /var/log. The orchestrator handles all of this itself
# in offline mode, so finalize.sh's caller environment looks the same in
# both modes by the time finalize.sh runs.
source "$OMARCHY_INSTALL/preflight/guard.sh"
source "$OMARCHY_INSTALL/preflight/begin.sh"
run_logged "$OMARCHY_INSTALL/preflight/show-env.sh"
# Install/update the omarchy runtime + the default install set.
_omarchy_runtime_pkg="${OMARCHY_RUNTIME_PACKAGE:-omarchy}"
mapfile -t _omarchy_base_pkgs < <(grep -v '^#\|^$' "$OMARCHY_PATH/install/omarchy-base.packages")
if install_mode_is offline; then
pacman -Q "$_omarchy_runtime_pkg" >/dev/null 2>&1 || {
echo "Error: $_omarchy_runtime_pkg must be installed before install.sh runs in offline mode" >&2
exit 1
}
else
sudo pacman -Syu --noconfirm --needed "$_omarchy_runtime_pkg" "${_omarchy_base_pkgs[@]}"
fi
sudo pacman -Syu --noconfirm --needed "$_omarchy_runtime_pkg" "${_omarchy_base_pkgs[@]}"
exec bash "$OMARCHY_PATH/finalize.sh"