From 96509011d0cd432ecdf4d6ece555d970e281f6a5 Mon Sep 17 00:00:00 2001 From: davidovski Date: Mon, 16 Jan 2023 12:17:40 +0000 Subject: fix installer colors --- iso/root/installer.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'iso/root/installer.sh') diff --git a/iso/root/installer.sh b/iso/root/installer.sh index ed20bf9..bed9ce8 100755 --- a/iso/root/installer.sh +++ b/iso/root/installer.sh @@ -7,6 +7,7 @@ logfile="installer.log" default_packages="base linux xipkg dracut grub mksh sudo neofetch vim tzdata" additional_services="networkmanager xorg iwd" + list_disks () { lsblk -r | while read -r line; do set - $line @@ -37,8 +38,11 @@ partition_disk () { } welcome_splash () { - t_dialogue "Welcome to the xilinux installer" "" - + t_radio "welcome to the xilinux installer" "continue" "exit to shell" + [ "$T_RESULT" != "continue" ] && { + t_clean + exit 0 + } } @@ -160,7 +164,7 @@ install_grub () { } enter_password () { - export password="" + export passwd="" t_input_hidden "Enter Password:" passwd=$T_RESULT t_input_hidden "Confirm Password:" @@ -213,11 +217,11 @@ set_timezone () { } select_timezone () { - t_clean_ptrn + t_cls_ptrn zoneinfo="$sysroot/usr/share/zoneinfo" selection=$1 t_paged_radio "Select your timezone: $selection" $(ls "$zoneinfo/$selection") "more..." - [] + selection="$selection/$T_RESULT" [ -f "$zoneinfo/$selection" ] && { -- cgit v1.2.1