From 835a8d7dee7fe0c98fc361e8c90b5e3fc03462d7 Mon Sep 17 00:00:00 2001
From: Matt C <mcompton2002@gmail.com>
Date: Tue, 11 May 2021 22:12:55 -0400
Subject: [PATCH] Output improvement & XFCE or Budgie

---
 continue.sh     | 18 ++++++++++++++++--
 crystinstall.sh |  3 +++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/continue.sh b/continue.sh
index 51adb1f..5114ce8 100644
--- a/continue.sh
+++ b/continue.sh
@@ -14,8 +14,8 @@ prompt() {
     read response
 }
 
-TZ="/usr/share/zoneinfo/FUCK/OFF"
-
+clear
+TZ="/usr/share/LMAO/XD"
 while [[ ! -f $TZ ]]; do
     prompt "Pick a time zone (Format: America/New_York , Europe/London, etc)"
     PT="$response"
@@ -30,6 +30,7 @@ hwclock --systohc
 echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen
 echo "LANG=en_US.UTF-8" > /etc/locale.conf
 
+clear
 prompt "Do you need more locales than just en_US? (y/N)"
 MORE="$response"
 
@@ -63,6 +64,7 @@ if [[ -f /keymap ]]; then
     echo "KEYMAP=${KMP}" > /etc/vconsole.conf
 fi
 
+clear
 prompt "System hostname"
 HOSTNAME="$response"
 echo ${HOSTNAME} > /etc/hostname
@@ -74,6 +76,7 @@ if [[ "$IPS" == "y" || "$IPS" == "Y" ]]; then
 fi
 echo "127.0.1.1       ${HOSTNAME}.localdomain ${HOSTNAME}" >> /etc/hosts
 
+clear
 inf "Password for root"
 passwd
 
@@ -103,14 +106,19 @@ systemctl enable NetworkManager
 pacman-key --init
 pacman-key --populate archlinux
 
+
+clear
 prompt "Would you like to install a DE profile? (y/N)"
 DEP="$response"
 
 if [[ "$DEP" == "y" || "$DEP" == "Y" ]]; then
     inf "- KDE"
     inf "- GNOME"
+    inf "- XFCE"
+    inf "- Budgie"
     inf "- i3"
     inf "(We'll add more as people ask)"
+    inf "Please enter exactly as shown."
     prompt ""
     DE="$response"
 
@@ -120,6 +128,12 @@ if [[ "$DEP" == "y" || "$DEP" == "Y" ]]; then
     elif [[ "$DE" == "GNOME" ]]; then
         pacman -Sy --noconfirm gnome gnome-extra
         DM="gdm"
+    elif [[ "$DE" == "XFCE" ]]; then
+        pacman -Sy --noconfirm xfce4 xfce4-goodies
+        DM="sddm"
+    elif [[ "$DE" == "Budgie" ]]; then
+        pacman -Sy --noconfirm budgie-desktop gnome
+        DM="gdm"
     elif [[ "$DE" == "i3" ]]; then
         inf "Choose either i3 or i3-gaps in below prompt. Rest of group is your preference (or not"
         inf "Press enter"
diff --git a/crystinstall.sh b/crystinstall.sh
index bd75c22..cf93d0e 100755
--- a/crystinstall.sh
+++ b/crystinstall.sh
@@ -35,7 +35,9 @@ if [[ "$KBD" == "y" || "$KBD" == "Y" ]]; then
     loadkeys ${KMP}
 fi
 
+clear
 
+inf "Disks:"
 fdisk -l | grep Disk | grep sectors --color=never
 
 prompt "Would you like to partition manually? (y/N)"
@@ -129,6 +131,7 @@ if [[ "$MANUAL" == "no" ]]; then
         fi
     fi
 else
+    clear
     inf "You have chosen manual partitioning."
     inf "We're going to drop to a shell for you to partition, but first, PLEASE READ these notes."
     inf "Before you exit the shell, make sure to format and mount a partition for / at /mnt"