feat: paru auto-install + ASCII Header + Continue-Prompt
- paru wird jetzt in detect_environment() auf frischen Systemen installiert
(vorher nur in preflight, das bei --fresh nie durchlief)
- install_aur_helper() von preflight nach utils.sh verschoben (global verfügbar)
- Header von Cherokee-Zeichen ('Ꮎ Ꮇ Ꭼ Ꮢ Ꮎ Ꮑ') auf ASCII ('O M E R O N')
umgestellt — Cherokee zeigte auf manchen Terminals Fragezeichen
- Continue with installation? Prompt nach Banner als erster interaktiver Schritt
- basic mode header jetzt sauberes ASCII (===== statt Box-Zeichen)
This commit is contained in:
29
install.sh
29
install.sh
@@ -99,7 +99,7 @@ detect_environment() {
|
||||
|
||||
if ((!OMERON_HAS_GUM)) && have pacman; then
|
||||
printf '\033[1;36m━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\033[0m\n'
|
||||
printf '\033[1;36m Ꮎ Ꮇ Ꭼ Ꮢ Ꮎ Ꮑ — Modular System Setup Framework\033[0m\n'
|
||||
printf '\033[1;36m O M E R O N — Modular System Setup Framework\033[0m\n'
|
||||
printf '\033[1;36m━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\033[0m\n'
|
||||
printf '\n'
|
||||
printf ' \033[1;33mgum is not installed.\033[0m Installing it enables the full TUI experience.\n'
|
||||
@@ -125,8 +125,13 @@ detect_environment() {
|
||||
fi
|
||||
fi
|
||||
|
||||
if ((OMERON_FRESH_INSTALL)) && ((!OMERON_HAS_GUM)) && have pacman; then
|
||||
tui_install_gum 2>/dev/null || true
|
||||
if ((OMERON_FRESH_INSTALL)); then
|
||||
if ((!OMERON_HAS_GUM)) && have pacman; then
|
||||
tui_install_gum 2>/dev/null || true
|
||||
fi
|
||||
if ! have paru && ! have yay; then
|
||||
install_aur_helper
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -203,14 +208,10 @@ collect_all_interactive() {
|
||||
}
|
||||
|
||||
show_banner() {
|
||||
tui_header " Ꮎ Ꮇ Ꭼ Ꮢ Ꮎ Ꮑ "
|
||||
tui_info "Modular System Setup Framework"
|
||||
tui_info "Arch / Hyprland / CachyOS"
|
||||
tui_header "O M E R O N — Modular System Setup"
|
||||
printf '\n'
|
||||
|
||||
if ((OMERON_FRESH_INSTALL)); then
|
||||
tui_warn "FRESH INSTALL MODE"
|
||||
tui_info "Will install Hyprland, GPU drivers, and all dependencies."
|
||||
tui_info "Fresh install: Hyprland + GPU drivers + all dependencies"
|
||||
printf '\n'
|
||||
fi
|
||||
}
|
||||
@@ -230,6 +231,14 @@ main() {
|
||||
|
||||
show_banner
|
||||
|
||||
tui_separator
|
||||
printf '\n'
|
||||
if ! tui_confirm "Continue with installation"; then
|
||||
tui_info "Installation cancelled."
|
||||
exit 0
|
||||
fi
|
||||
printf '\n'
|
||||
|
||||
local modules_to_run=()
|
||||
if ((${#RUN_MODULES[@]})); then
|
||||
mapfile -t modules_to_run < <(collect_modules)
|
||||
@@ -268,7 +277,7 @@ main() {
|
||||
done
|
||||
|
||||
printf '\n'
|
||||
tui_header " Ꮎ Ꮇ Ꭼ Ꮢ Ꮎ Ꮑ "
|
||||
tui_header "O M E R O N — Done"
|
||||
tui_success "Installation Complete!"
|
||||
printf '\n'
|
||||
tui_info "Log: ${OMERON_LOG_FILE}"
|
||||
|
||||
Reference in New Issue
Block a user