Move full-runtime dep to omarchy meta; thin omarchy-installer
Apollo-recommended dep split: - omarchy-installer: bash gum jq git only (just the runner) - omarchy: depends on omarchy-keyring + omarchy-settings + omarchy-limine + the runtime stack - omarchy-settings, omarchy-limine: standalone install.sh now installs the runtime (pacman -Syu --needed omarchy) before sourcing preflight/all.sh in online mode, and asserts it's already present in offline mode (ISO pacstraps it before user creation so /etc/skel is populated). boot.sh installs only omarchy-keyring + omarchy-installer (small + fast), then exec's omarchy-install which handles the full-runtime pull. User-visible effect: 'pacman -S omarchy-installer' now installs ~5 files instead of the entire Omarchy stack. Users get a clean choice between 'I just want the installer' and 'I want the full Omarchy desktop'.
This commit is contained in:
@@ -45,7 +45,9 @@ echo "Refreshing pacman databases..."
|
||||
sudo pacman -Sy --noconfirm
|
||||
|
||||
echo "Installing omarchy-installer..."
|
||||
sudo pacman -S --noconfirm --needed omarchy-installer
|
||||
# Only install the runner here — install.sh pulls the full omarchy runtime
|
||||
# itself once it knows the mode and has logged in.
|
||||
sudo pacman -S --noconfirm --needed omarchy-keyring omarchy-installer
|
||||
|
||||
echo -e "\nInstallation starting..."
|
||||
exec omarchy-install
|
||||
|
||||
+15
@@ -17,6 +17,21 @@ detect_install_mode
|
||||
export_legacy_mode_flags
|
||||
|
||||
source "$OMARCHY_INSTALL/helpers/all.sh"
|
||||
|
||||
# The install scripts assume the full omarchy runtime is installed (preflight
|
||||
# guards check for limine; config scripts call omarchy-* commands; etc.).
|
||||
# Online: install it now via pacman. Offline: the ISO was supposed to pacstrap
|
||||
# it before user creation, so just assert it's present.
|
||||
_omarchy_runtime_pkg="${OMARCHY_RUNTIME_PACKAGE:-omarchy}"
|
||||
if install_mode_is offline; then
|
||||
pacman -Q "$_omarchy_runtime_pkg" >/dev/null 2>&1 || {
|
||||
echo "Error: $_omarchy_runtime_pkg must be pacstrapped before omarchy-install runs in offline mode" >&2
|
||||
exit 1
|
||||
}
|
||||
else
|
||||
sudo pacman -Syu --noconfirm --needed "$_omarchy_runtime_pkg"
|
||||
fi
|
||||
|
||||
source "$OMARCHY_INSTALL/preflight/all.sh"
|
||||
source "$OMARCHY_INSTALL/packaging/all.sh"
|
||||
source "$OMARCHY_INSTALL/config/all.sh"
|
||||
|
||||
Reference in New Issue
Block a user