Ryan Hughes
7fffc5f3c4
Drop online-git: the new world has a single package-backed install path that's either online (pacman pulls from omacom-pkgs.org) or offline (ISO chroot pulls from the bundled mirror). The git-clone-and-run-installer path is gone — boot.sh becomes a thin bootstrap that installs the omarchy-installer package and invokes its installer. - install/helpers/mode.sh: two modes, validation message updated. Default fallback is 'online' (the boot.sh path); OMARCHY_CHROOT_INSTALL=1 still shims to offline, OMARCHY_ONLINE_INSTALL=true still shims to online. - install/preflight/all.sh: first-run-mode + disable-mkinitcpio gated on offline (offline is the from-scratch chroot path; online runs on an existing system). - install/preflight/pacman.sh: DELETED. boot.sh now handles repo config before install.sh runs. - install/packaging/all.sh: drop base.sh entirely. Both modes have base packages installed via omarchy-installer's depends before install.sh runs. base.sh remains on disk in case the ISO mirror build flow wants to invoke it directly. - install/helpers/chroot.sh, errors.sh, post-install/finished.sh, config/mise-work.sh: rename mode checks to use online/offline.
39 lines
1.1 KiB
Bash
39 lines
1.1 KiB
Bash
stop_install_log
|
|
|
|
echo_in_style() {
|
|
echo "$1" | tte --canvas-width 0 --anchor-text c --frame-rate 640 print
|
|
}
|
|
|
|
clear
|
|
echo
|
|
tte -i $OMARCHY_PATH/logo.txt --canvas-width 0 --anchor-text c --frame-rate 920 laseretch
|
|
echo
|
|
|
|
# Display installation time if available
|
|
if [[ -f $OMARCHY_INSTALL_LOG_FILE ]] && grep -q "Total:" "$OMARCHY_INSTALL_LOG_FILE" 2>/dev/null; then
|
|
echo
|
|
TOTAL_TIME=$(tail -n 20 "$OMARCHY_INSTALL_LOG_FILE" | grep "^Total:" | sed 's/^Total:[[:space:]]*//')
|
|
if [[ -n $TOTAL_TIME ]]; then
|
|
echo_in_style "Installed in $TOTAL_TIME"
|
|
fi
|
|
else
|
|
echo_in_style "Finished installing"
|
|
fi
|
|
|
|
if sudo test -f /etc/sudoers.d/99-omarchy-installer; then
|
|
sudo rm -f /etc/sudoers.d/99-omarchy-installer &>/dev/null
|
|
fi
|
|
|
|
# Exit gracefully if user chooses not to reboot
|
|
if gum confirm --padding "0 0 0 $((PADDING_LEFT + 32))" --show-help=false --default --affirmative "Reboot Now" --negative "" ""; then
|
|
# Clear screen to hide any shutdown messages
|
|
clear
|
|
|
|
if install_mode_is offline; then
|
|
touch /var/tmp/omarchy-install-completed
|
|
exit 0
|
|
else
|
|
sudo reboot 2>/dev/null
|
|
fi
|
|
fi
|