From 4a72bfade01bf4653d6d8b6f521b12afa6f27d31 Mon Sep 17 00:00:00 2001
From: natemaia <natemaia10@gmail.com>
Date: Tue, 20 Aug 2019 23:39:09 -0700
Subject: [PATCH] Tweak some parts of install

---
 archlabs-installer | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/archlabs-installer b/archlabs-installer
index 13ae937..dbe8f9c 100755
--- a/archlabs-installer
+++ b/archlabs-installer
@@ -5,7 +5,7 @@
 # Some ideas and code reworked from other resources
 # AIF, Cnichi, Calamares, Arch Wiki.. Credit where credit is due
 
-VER="2.0.53"     # installer version
+VER="2.0.54"     # installer version
 DIST="ArchLabs"  # linux distributor
 MNT="/mnt"       # install mountpoint
 ANS="/tmp/ans"   # dialog answer file
@@ -1485,6 +1485,11 @@ install_boot()
 		find $MNT/$BOOTDIR/EFI/ -maxdepth 1 -mindepth 1 -iname 'BOOT' -type d -delete
 	fi
 
+	if [[ ! -e $MNT/$BOOTDIR/$UCODE ]]; then
+		chrun "pacman -S $UCODE --noconfirm"
+		[[ -e $MNT/$BOOTDIR/$UCODE ]] || UCODE=""
+	fi
+
 	prerun_$BOOTLDR
 	chrun "${BCMDS[$BOOTLDR]}" 2>$ERR
 	errshow 1 "${BCMDS[$BOOTLDR]}"
@@ -1515,6 +1520,7 @@ install_boot()
 install_user()
 {
 	rm -f $MNT/root/.zshrc  # remove welcome message from root zshrc
+
 	chrun "chpasswd <<< 'root:$ROOT_PASS'" 2>$ERR
 	errshow 1 "set root password"
 	if [[ $MYSHELL != "/usr/bin/zsh" ]]; then # root uses zsh by default, change it if something else was chosen
@@ -1656,7 +1662,7 @@ install_packages()
 	[[ $INSTALL_WMS =~ (openbox|bspwm|i3-gaps|dwm|fluxbox) ]] && inpkg+="$WM_BASE_PKGS "
 
 	# ensure a terminal gets installed if one wasn't chosen or a DE that installs one
-	[[ $inpkg =~ (term|urxvt|tilix|alacritty|sakura|tilda|plasma|cinnamon) || $INSTALL_WMS == *dwm* ]] || inpkg+=" xterm"
+	[[ $inpkg =~ (term|urxvt|tilix|alacritty|sakura|tilda|plasma|cinnamon) || $INSTALL_WMS == *dwm* ]] || inpkg+="xterm "
 
 	# update first to avoid issues
 	chrun "pacman -Syyu --noconfirm"