From 71ba555d25f149eb35e6e36793997ae25eb08047 Mon Sep 17 00:00:00 2001
From: The_miro <amir@abdelbaki.eu>
Date: Sun, 25 May 2025 13:35:01 +0200
Subject: [PATCH] further set up the live installer

---
 setup/live-install.sh          | 82 +++++++++++++++++++++++++---------
 setup/modules/core-packages.sh |  2 +-
 2 files changed, 63 insertions(+), 21 deletions(-)

diff --git a/setup/live-install.sh b/setup/live-install.sh
index 5adb7cd..b25b1e5 100755
--- a/setup/live-install.sh
+++ b/setup/live-install.sh
@@ -9,104 +9,146 @@ echo "sleeping for 20s"
 let "timedatecheckwaitercount=timedatecheckwaitercount+1"
 
 #this is hard coded for assurance that the wait wont be skipped
-echo  = $timedatecheckwaitercount 
+echo $timedatecheckwaitercount 
 sleep 1s
 let "timedatecheckwaitercount=timedatecheckwaitercount+1"
 
 
-echo  = $timedatecheckwaitercount 
+echo $timedatecheckwaitercount 
 sleep 1s
 let "timedatecheckwaitercount=timedatecheckwaitercount+1"
 
 
-echo  = $timedatecheckwaitercount 
+echo $timedatecheckwaitercount 
 sleep 1s
 let "timedatecheckwaitercount=timedatecheckwaitercount+1"
 
 
-echo  = $timedatecheckwaitercount 
+echo $timedatecheckwaitercount 
 sleep 1s
 let "timedatecheckwaitercount=timedatecheckwaitercount+1"
 
 
-echo  = $timedatecheckwaitercount 
+echo $timedatecheckwaitercount 
 sleep 1s
 let "timedatecheckwaitercount=timedatecheckwaitercount+1"
 
 
-echo  = $timedatecheckwaitercount 
+echo $timedatecheckwaitercount 
 sleep 1s
 let "timedatecheckwaitercount=timedatecheckwaitercount+1"
 
 
-echo  = $timedatecheckwaitercount 
+echo $timedatecheckwaitercount 
 sleep 1s
 let "timedatecheckwaitercount=timedatecheckwaitercount+1"
 
 
-echo  = $timedatecheckwaitercount 
+echo $timedatecheckwaitercount 
 sleep 1s
 let "timedatecheckwaitercount=timedatecheckwaitercount+1"
 
 
-echo  = $timedatecheckwaitercount 
+echo $timedatecheckwaitercount 
 sleep 1s
 let "timedatecheckwaitercount=timedatecheckwaitercount+1"
 
 
-echo  = $timedatecheckwaitercount 
+echo $timedatecheckwaitercount 
 sleep 1s
 let "timedatecheckwaitercount=timedatecheckwaitercount+1"
 
 
-echo  = $timedatecheckwaitercount 
+echo $timedatecheckwaitercount 
 sleep 1s
 let "timedatecheckwaitercount=timedatecheckwaitercount+1"
 
 
-echo  = $timedatecheckwaitercount 
+echo $timedatecheckwaitercount 
 sleep 1s
 let "timedatecheckwaitercount=timedatecheckwaitercount+1"
 
 
-echo  = $timedatecheckwaitercount 
+echo $timedatecheckwaitercount 
 sleep 1s
 let "timedatecheckwaitercount=timedatecheckwaitercount+1"
 
 
-echo  = $timedatecheckwaitercount 
+echo $timedatecheckwaitercount 
 sleep 1s
 let "timedatecheckwaitercount=timedatecheckwaitercount+1"
 
 
-echo  = $timedatecheckwaitercount 
+echo $timedatecheckwaitercount 
 sleep 1s
 let "timedatecheckwaitercount=timedatecheckwaitercount+1"
 
 
-echo  = $timedatecheckwaitercount 
+echo $timedatecheckwaitercount 
 sleep 1s
 let "timedatecheckwaitercount=timedatecheckwaitercount+1"
 
 
-echo  = $timedatecheckwaitercount 
+echo $timedatecheckwaitercount 
 sleep 1s
 let "timedatecheckwaitercount=timedatecheckwaitercount+1"
 
 
-echo  = $timedatecheckwaitercount 
+echo $timedatecheckwaitercount 
 sleep 1s
 let "timedatecheckwaitercount=timedatecheckwaitercount+1"
 
 
-echo  = $timedatecheckwaitercount 
+echo $timedatecheckwaitercount 
 sleep 1s
 let "timedatecheckwaitercount=timedatecheckwaitercount+1"
 
 
-echo  = $timedatecheckwaitercount 
+echo $timedatecheckwaitercount 
 sleep 1s
 let "timedatecheckwaitercount=timedatecheckwaitercount+1"
 
 echo "Continuing..."
 
+echo "running lsblk..."
+lsblk
+echo -n "Enter blockdev to install on or m for manual partitioning: " 
+read blockdev
+if [ "$statecon" != '' ]; then 
+
+    fdisk $blockdev
+
+else
+    
+    fdisk $blockdev <<EEOF
+    g
+    n
+    1
+    1
+    +1G
+    
+
+    n
+    2
+    1
+    10G
+
+
+
+
+    n
+    3
+    1
+    
+
+
+
+
+    w
+    EEOF
+    exit 0
+
+fi
+
+echo "Formatting Complete"
+
diff --git a/setup/modules/core-packages.sh b/setup/modules/core-packages.sh
index 023bbd2..3f39703 100644
--- a/setup/modules/core-packages.sh
+++ b/setup/modules/core-packages.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-sudo pacman -Syu 7zip pipewire distrobox htop nano vim firefox flatpak grub inetutils networkmanager neovim openssh base base-devel cockpit cockpit-files cockpit-podman zip unzip ufw fastfetch git wireplumber wpa_supplicant tree traceroute smartmontools ruby-pkg-config rust rustup usbutils pciutils qrencode bind btop gcc glib2 python python-pip atool nvim curl wget fastfetch fail2ban man-db wprs mc yazi atftp base base-devel btrfs-progs bluez ffmpeg gcc git grub htop inetutils iwd jq ldns libpulse linux linux-firmware openssh smartmontools traceroute ufw unzip zip vim wireless_tools wpa_supplicant zram-generator podman vnstat
+sudo pacman -Syu git 7zip pipewire distrobox htop nano vim firefox flatpak grub inetutils networkmanager neovim openssh base base-devel cockpit cockpit-files cockpit-podman zip unzip ufw fastfetch git wireplumber wpa_supplicant tree traceroute smartmontools ruby-pkg-config rust rustup usbutils pciutils qrencode bind btop gcc glib2 python python-pip atool nvim curl wget fastfetch fail2ban man-db wprs mc yazi atftp base base-devel btrfs-progs bluez ffmpeg gcc git grub htop inetutils iwd jq ldns libpulse linux linux-firmware openssh smartmontools traceroute ufw unzip zip vim wireless_tools wpa_supplicant zram-generator podman vnstat