From 2947da8c425e562ca54506643b462583a598c30e Mon Sep 17 00:00:00 2001
From: natemaia <natemaia10@gmail.com>
Date: Sun, 12 Jun 2022 16:23:04 -0700
Subject: [PATCH] Version bump for auto-update

---
 installer | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/installer b/installer
index 73bf18f..1a50f8e 100755
--- a/installer
+++ b/installer
@@ -6,7 +6,7 @@
 # AIF, Calamares, and the Arch Wiki.. Credit where credit is due
 
 # shellcheck disable=2086,2046,2254,2164,2030,2031,2001
-VER=2.18
+VER=2.19
 
 # default values {
 
@@ -489,6 +489,8 @@ select_show()
 	[[ $INSTALL_WMS == *dwm* ]] && pkgs="dwm st dmenu $pkgs"
 	pkgs="${pkgs//  / }"
 	pkgs="${pkgs# }"
+
+	# make a cleaner package list broken into lines around 60 characters
 	pkgs="${pkgs// /\\n}"
 	typeset -i count=0
 	while read -re pkg; do
@@ -496,7 +498,7 @@ select_show()
 			fmtpkgs+="$pkg "
 			(( count += ${#pkg} + 1 ))
 		else
-			fmtpkgs+="\n              $pkg "
+			fmtpkgs+="\n              $pkg " # new line so we need to match indentation
 			count=$(( ${#pkg} + 1 ))
 		fi
 	done < <(echo -e "$pkgs")
@@ -1663,14 +1665,14 @@ mount_filesystem()
 {
 	local part="$1"
 	local fs=''
-	local cur txt pt
+	local cur txt
 	cur="$(lsblk -lno FSTYPE "$part" 2> /dev/null)"
 	txt="\nSelect which file system to use for $(part_pretty "$part")\n\ndefault:  ext4"
 
 	if [[ $cur ]]; then
-		txt+="\nexisting:  $cur"
 		# bail early if the partition was created in part_auto()
 		[[ $part == "$AUTO_ROOT" ]] && return 0
+		txt+="\nexisting:  $cur"
 	fi
 
 	BTRFS=0
@@ -1900,7 +1902,7 @@ install_user()
 	local groups='video,log,rfkill,wheel'
 	[[ -e $MNT/etc/X11/xorg.conf.d/20-nvidia.conf && -e $MNT/usr/bin/optirun ]] && groups+=',bumblebee'
 
-	rm -f "$MNT/root/.zlogin"  # remove welcome message
+	# rm -f "$MNT/root/.zlogin"  # remove welcome message
 
 	echo "Setting root user password and shell"
 	chrun "chpasswd <<< 'root:$ROOT_PASS'" 2> "$ERR" 2>&1
@@ -2439,8 +2441,11 @@ config_console()
 		cat > "$AUTOLOGIN_SERV/autologin.conf" <<- EOF
 		[Service]
 		ExecStart=
-		ExecStart=-/sbin/agetty --autologin $NEWUSER --noclear %I 38400 linux
+		ExecStart=-/sbin/agetty -o '-p -f -- \\\u' --noclear --autologin $NEWUSER - \$TERM
 		EOF
+		# [Service]
+		# ExecStart=
+		# ExecStart=-/sbin/agetty --autologin $NEWUSER --noclear %I 38400 linux
 	else
 		rm -rf "$AUTOLOGIN_SERV"
 	fi
@@ -2471,7 +2476,7 @@ config_console()
 		echo \$PATH | grep -q "\$HOME/.local/bin:" || export PATH="\$HOME/.local/bin:\$PATH"
 
 		# automatically run $ses when logging in on tty1
-		[ -z "\$DISPLAY" ] && [ \$XDG_VTNR -eq 1 ] && $ses
+		[ -z "\$DISPLAY" ] && [ \$XDG_VTNR -eq 1 ] && sleep 2 && $ses
 		EOF
 	else
 		rm -rf "$MNT/home/$NEWUSER/.xinitrc" "$MNT/root/.xinitrc"