Drop orchestrator from omarchy-installer (moved to omarchy-iso)
The orchestrator only runs on the live ISO, so it lives in omarchy-iso where the rest of the ISO-specific code (configurator, .automated_script .sh, archinstall pacman config) lives. omarchy-installer stays the monorepo of Omarchy source content (configs, themes, default files, install scripts) without a Python install driver mixed in. bin/omarchy-install simplifies to a one-liner: it's the online entry point now, no --config dispatcher. The orchestrator never invokes it; it runs finalize.sh directly via arch-chroot.
This commit is contained in:
+4
-19
@@ -1,26 +1,11 @@
|
||||
#!/bin/bash
|
||||
|
||||
# omarchy:summary=Run the Omarchy installer (shipped via omarchy-installer)
|
||||
# omarchy:summary=Online Omarchy install (on an existing Arch system)
|
||||
# omarchy:group=install
|
||||
# omarchy:args=[--config <json> --creds <json> ...] | [install.sh args]
|
||||
|
||||
set -eEo pipefail
|
||||
|
||||
# Dispatcher:
|
||||
# --config <json> → Python orchestrator (ISO install)
|
||||
# anything else → bash install.sh (online rerun on an installed system)
|
||||
#
|
||||
# The Python orchestrator owns the ISO install end-to-end: partitioning,
|
||||
# pacstrap, bootloader, user creation, package install, and finally calling
|
||||
# finalize.sh inside the chroot. install.sh is the simpler online path:
|
||||
# ensures the omarchy runtime is up to date, then exec's finalize.sh.
|
||||
for arg in "$@"; do
|
||||
case "$arg" in
|
||||
--config|--config=*)
|
||||
cd "${OMARCHY_PATH:-/usr/share/omarchy}/install"
|
||||
exec python -m orchestrator.main "$@"
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
# Online entry point. The ISO install is driven by omarchy-iso's Python
|
||||
# orchestrator instead, which arch-chroots into /mnt and runs finalize.sh
|
||||
# directly — never touches this script.
|
||||
exec bash "${OMARCHY_PATH:-/usr/share/omarchy}/install.sh" "$@"
|
||||
|
||||
Reference in New Issue
Block a user