From 25c57593ad8679e2576154eb3d3e129e1ff27c89 Mon Sep 17 00:00:00 2001
From: Janis Hutz <development@janishutz.com>
Date: Tue, 28 Nov 2023 19:10:39 +0100
Subject: [PATCH] some userland fixes

---
 chroot.sh   | 23 ++++++++++++++++++-----
 userland.sh | 13 -------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/chroot.sh b/chroot.sh
index 28c36f4..b4e62de 100755
--- a/chroot.sh
+++ b/chroot.sh
@@ -54,10 +54,6 @@ echo "
 
 ==> Bootloader set up.
 
-"
-
-echo "
-
 ==> Creating new user, please choose a password once prompted!
 
 "
@@ -66,6 +62,7 @@ read -p "Choose a password: " pwd
 
 # Create users
 useradd -m arch-is-best
+sleep 2
 passwd arch-is-best << EOD
 ${pwd}
 ${pwd}
@@ -80,6 +77,7 @@ mkdir --parent /home/arch-is-best/arch-dev-vm
 ls /root/arch-dev-vm
 
 
+# Prepare for switching to new user
 mv -v /root/arch-dev-vm /home/arch-is-best/
 
 sleep 2
@@ -93,11 +91,26 @@ to finish up setup
 
 "
 
-# Head into userland with userland.sh script
+sleep 2
+
+# Add additional packages
+read -p "Do you want to have a barebone (b) or complete (c) install? " installType
+
+if [[ "$installType" != "c" ]]; then
+    pacman -Syu --noconfirm nodejs npm rustup kate python-pip gcc
+fi
+
+pacman -Syu --noconfirm vscodium
+
+chmod -R 777 /home/arch-is-best/arch-dev-vm/config
+
+
+# Head into userland with userland.sh script (run all operations requiring root before!)
 chmod 777 /home/arch-is-best/arch-dev-vm/vscode-extensions
 su arch-is-best -c /home/arch-is-best/arch-dev-vm/userland.sh
 
 
+sleep 2
 
 echo "
 
diff --git a/userland.sh b/userland.sh
index 54a9300..6f8aef4 100755
--- a/userland.sh
+++ b/userland.sh
@@ -6,21 +6,8 @@ echo "
 
 "
 
-read -p "Please enter your password again: " pwd
-
-read -p "Do you want to have a barebone (b) or complete (c) install? " installType
-
-if [[ "$installType" != "c" ]]; then
-    echo $pwd | sudo -S pacman -Syu --noconfirm nodejs npm rustup kate python-pip gcc
-fi
-
-echo $pwd | sudo -S pacman -Syu --noconfirm vscodium
-
-
 mkdir /home/arch-is-best/.config
 
-echo $pwd | sudo -S chmod -R 777 /home/arch-is-best/arch-dev-vm/config
-
 mv /home/arch-is-best/arch-dev-vm/config/* /home/arch-is-best/.config
 
 file="/home/arch-is-best/vscode-extensions"