summaryrefslogtreecommitdiff
path: root/iso/root
diff options
context:
space:
mode:
authordavidovski <david@davidovski.xyz>2023-01-16 12:17:40 +0000
committerdavidovski <david@davidovski.xyz>2023-01-16 12:17:40 +0000
commit96509011d0cd432ecdf4d6ece555d970e281f6a5 (patch)
tree32a554a3e7e4386e35a92ee39e41d7732e604b62 /iso/root
parentc42abbd0f192a5d4a6a58fd901f45d2c06b018b5 (diff)
fix installer colors
Diffstat (limited to 'iso/root')
-rw-r--r--iso/root/.profile2
-rwxr-xr-xiso/root/installer.sh14
2 files changed, 10 insertions, 6 deletions
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" ] && {