diff --git a/assets/installer/banner.txt b/assets/installer/banner.txt index a7f2623..8754ff8 100644 --- a/assets/installer/banner.txt +++ b/assets/installer/banner.txt @@ -1,7 +1,5 @@ - _ __ - _ _____ (_) /___ _____ ____ _____ -| | / / _ \/ / / __ \/ ___/_____/ __ \/ ___/ -| |/ / __/ / / /_/ / / /_____/ /_/ (__ ) -|___/\___/_/_/\____/_/ \____/____/ - - hardened. branded. yours. +██ ██ ███████ ██ ██ ██████ ██████ ██████ ███████ +██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ +██ ██ █████ ██ ██ ██ ██ ██████ ██ ██ ███████ + ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ + ████ ███████ ██ ███████ ██████ ██ ██ ██████ ███████ diff --git a/overlay/usr/local/bin/veilor-installer b/overlay/usr/local/bin/veilor-installer index f534191..9f75049 100644 --- a/overlay/usr/local/bin/veilor-installer +++ b/overlay/usr/local/bin/veilor-installer @@ -180,10 +180,10 @@ prompt_error() { } main_menu() { - prompt_choose "Welcome. What would you like to do?" \ - "Install veilor-os to disk" \ - "Try live — desktop (KDE Plasma)" \ - "Try live — shell" \ + prompt_choose "Welcome" \ + "Install" \ + "live - (KDE)" \ + "live - shell" \ "Reboot" \ "Power off" } @@ -205,7 +205,8 @@ collect_answers() { disk=$(prompt_choose_pairs "Select install disk (will be ERASED)" "${disks_pairs[@]}") || return 1 # ── Hostname ── - hostname=$(prompt_input "Set hostname" "veilor") || return 1 + # Hardcoded for branded consistency. Post-install: `hostnamectl set-hostname`. + hostname="veilor" # Reject shell-special and sed-special chars in passwords. Generated # kickstart writes them via heredoc + sed substitution; bare $, ", \, ` @@ -240,15 +241,12 @@ collect_answers() { # ── Locale ── locale=$(prompt_choose "Choose locale" \ "en_GB.UTF-8" \ - "en_US.UTF-8" \ - "de_DE.UTF-8" \ - "fr_FR.UTF-8") || return 1 + "en_US.UTF-8") || return 1 # ── Confirmation ── prompt_confirm "About to install veilor-os: Disk: $disk (will be ERASED) - Hostname: $hostname Locale: $locale LUKS: set Admin pw: set @@ -572,13 +570,13 @@ banner while true; do case "$(main_menu)" in - "Install veilor-os to disk") + "Install") if collect_answers && generate_ks; then run_install || continue fi ;; - "Try live — desktop (KDE Plasma)") launch_desktop ;; - "Try live — shell") drop_to_shell ;; + "live - (KDE)") launch_desktop ;; + "live - shell") drop_to_shell ;; "Reboot") systemctl reboot ;; "Power off") systemctl poweroff ;; *) drop_to_shell ;;