Ryan Hughes
2beda6abed
Chunk 1 of the C3 refactor: replace the two-pass install model (archinstall CLI + custom shell dance + chroot bash installer) with a single Python orchestrator that owns phase ordering, using archinstall as a library subsystem. Splits the bash entry point into two: - install.sh: online entry point. Ensures omarchy runtime + base.packages are installed/up to date, then exec's finalize.sh. - finalize.sh: the in-target portion (preflight + packaging + config + login + post-install). Called by install.sh (online) AND by the orchestrator after arch-chroot -u $USER (offline). Adds the orchestrator skeleton under install/orchestrator/: - main.py: entry point, builds + runs the phase list - context.py: InstallContext (parsed configurator JSON + invocation paths) - phases.py: phase state machine (logging + state.json + error wrapping) - phases_impl.py: stubbed phase implementations (filled in by chunks 2-6) - archinstall_adapter.py: thin compat wall around archinstall lib imports (only this module imports from archinstall.*) - ui.py: gum subprocess wrappers so the orchestrator keeps the same styled-terminal UX as the bash installer Updates bin/omarchy-install to dispatch: - --config <json> in args → python -m orchestrator.main (ISO install) - anything else → bash install.sh (online rerun on installed system) Concrete phase logic lands in subsequent chunks. All phases currently raise NotImplementedError; the orchestrator imports cleanly and --help works as a smoke check.
30 lines
807 B
Python
30 lines
807 B
Python
"""Thin gum wrapper so the orchestrator keeps the same terminal UX as the
|
|
existing bash installer."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import subprocess
|
|
|
|
|
|
def style(text: str, *, foreground: str | None = None, padding: str | None = None) -> None:
|
|
cmd = ["gum", "style"]
|
|
if foreground:
|
|
cmd += ["--foreground", foreground]
|
|
if padding:
|
|
cmd += ["--padding", padding]
|
|
cmd.append(text)
|
|
subprocess.run(cmd, check=False)
|
|
|
|
|
|
def confirm(prompt: str, *, default: bool = True) -> bool:
|
|
cmd = ["gum", "confirm", "--default" if default else "--no-default", prompt]
|
|
return subprocess.run(cmd).returncode == 0
|
|
|
|
|
|
def info(text: str) -> None:
|
|
style(text, foreground="3", padding="1 0 0 4")
|
|
|
|
|
|
def error(text: str) -> None:
|
|
style(text, foreground="1", padding="1 0 0 4")
|