Ryan Hughes
6f74091fb6
Three modes the installer now branches on:
iso-chroot Running inside the new system's chroot from the ISO build.
pacman is configured by archinstall; systemd isn't running,
so service enables skip --now.
online-package Running on an existing Arch where the omarchy-* packages
are already installed. Skip base.sh and the bootstrap
preflight steps; only the per-host runtime ops in
config/login/post-install need to run.
online-git boot.sh path: clone into $HOME/.local/share/omarchy and
bootstrap everything from scratch.
install.sh derives OMARCHY_PATH from its own location, so the same script
works whether it's at /usr/share/omarchy/install.sh (package mode) or
$HOME/.local/share/omarchy/install.sh (git mode). install_mode_is helper
replaces direct ${OMARCHY_CHROOT_INSTALL:-} / ${OMARCHY_ONLINE_INSTALL:-}
checks in chroot.sh, finished.sh, errors.sh, mise-work.sh, preflight/pacman.sh.
Legacy vars still work through export_legacy_mode_flags, which sets
OMARCHY_CHROOT_INSTALL=1 / OMARCHY_ONLINE_INSTALL=true based on the
canonical mode for any caller that hasn't been updated.
bin/omarchy-install-mode prints the current mode for scripts/users that
need to introspect.
Smoke-tested all four entry paths (explicit mode, both legacy shims,
auto-detection from OMARCHY_PATH); each resolves correctly and the
legacy flags are exported in matching modes.
19 lines
578 B
Bash
19 lines
578 B
Bash
# In iso-chroot mode systemd isn't running, so skip --now and just enable.
|
|
chrootable_systemctl_enable() {
|
|
if install_mode_is iso-chroot; then
|
|
sudo systemctl enable $1
|
|
else
|
|
sudo systemctl enable --now $1
|
|
fi
|
|
}
|
|
|
|
# Like chrootable_systemctl_enable but never passes --now. Use for services
|
|
# we shouldn't (re)start mid-install (iwd interrupts the network; docker and
|
|
# power-profiles-daemon should defer to first boot).
|
|
chrootable_systemctl_enable_only() {
|
|
sudo systemctl enable $1
|
|
}
|
|
|
|
export -f chrootable_systemctl_enable
|
|
export -f chrootable_systemctl_enable_only
|