From 96509011d0cd432ecdf4d6ece555d970e281f6a5 Mon Sep 17 00:00:00 2001
From: davidovski <david@davidovski.xyz>
Date: Mon, 16 Jan 2023 12:17:40 +0000
Subject: fix installer colors

---
 iso/mkiso.sh          |  2 +-
 iso/root/.profile     |  2 +-
 iso/root/installer.sh | 14 +++++++++-----
 3 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'iso')

diff --git a/iso/mkiso.sh b/iso/mkiso.sh
index 925c52a..855c9dd 100755
--- a/iso/mkiso.sh
+++ b/iso/mkiso.sh
@@ -9,7 +9,7 @@ XI_ARGS=""
 
 chroot=/tmp/chroot
 isoroot=/tmp/iso
-iso_pkgs="linux linux-firmware base dracut grub bash xipkg squashfs-tools lvm2 cryptsetup networkmanager stty xitui"
+iso_pkgs="linux linux-firmware base dracut grub mksh xipkg squashfs-tools lvm2 cryptsetup networkmanager stty xitui neofetch"
 
 create_basesystem () {
     xi $XI_ARGS sync
diff --git a/iso/root/.profile b/iso/root/.profile
index a15c12b..6e29f99 100644
--- a/iso/root/.profile
+++ b/iso/root/.profile
@@ -3,7 +3,7 @@ splash () {
     echo "Welcome to xilinux"
 }
 
-[ "$(fgconsole 2>/dev/null)" = "1" ] && exec $HOME/installer.sh
+[ "$(fgconsole 2>/dev/null)" = "1" ] && $HOME/installer.sh
 
 splash
 
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" "<Continue>"
-
+    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