From 63a8660e5af6b71cd1ef201e38ce889063281e80 Mon Sep 17 00:00:00 2001
From: natemaia <natemaia10@gmail.com>
Date: Sun, 29 May 2022 15:36:01 -0700
Subject: [PATCH] Update sway session and info screen

---
 installer | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/installer b/installer
index a1205e4..6e133ad 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.16
+VER=2.17
 
 # default values {
 
@@ -183,7 +183,7 @@ declare -A WM_EXT=(
 [lxqt]='breeze breeze-icons picom libpulse network-manager-applet'
 [openbox]='archlabs-skel-openbox archlabs-obkey archlabs-kickshaw archlabs-paranoid archlabs-skel-xfce4 archlabs-i3lock-color archlabs-i3lock-fancy archlabs-pipemenus archlabs-ksuperkey obconf jgmenu tint2 conky rofi lxmenu-data'
 [plasma]='kde-applications-meta powerdevil'
-[sway]='archlabs-skel-sway foot grim slurp swayidle swaylock swappy jq lxappearance archlabs-swaync archlabs-sway-save-outputs archlabs-wlsunset archlabs-wdisplays archlabs-azote archlabs-autotiling archlabs-nwg-bar archlabs-nwg-dock archlabs-nwg-shell-config archlabs-nwg-drawer archlabs-nwg-menu archlabs-nwg-panel archlabs-nwg-wrapper archlabs-gopsuinfo wl-clipboard'
+[sway]='archlabs-skel-sway foot grim slurp swayidle swaylock swappy jq archlabs-nwg-shell archlabs-wlsunset archlabs-azote archlabs-autotiling'
 [xfce4]='archlabs-skel-xfce4 xfce4-goodies xfce4-pulseaudio-plugin network-manager-applet volumeicon rofi archlabs-ksuperkey'
 ) # }
 
@@ -485,9 +485,22 @@ main()
 
 select_show()
 {
-	local pkgs="${USER_PKGS[*]} ${SES_PKGS[*]}"
+	local pkgs="${USER_PKGS[*]} ${SES_PKGS[*]}" fmtpkgs='' pkg=''
 	[[ $INSTALL_WMS == *dwm* ]] && pkgs="dwm st dmenu $pkgs"
-	pkgs="${pkgs//  / }" pkgs="${pkgs# }"
+	pkgs="${pkgs//  / }"
+	pkgs="${pkgs# }"
+	pkgs="${pkgs// /\\n}"
+	typeset -i count=0
+	while read -re pkg; do
+		if (( count < 55 )); then
+			fmtpkgs+="$pkg "
+			(( count += ${#pkg} + 1 ))
+		else
+			fmtpkgs+="\n              $pkg "
+			count=$(( ${#pkg} + 15 ))
+		fi
+	done < <(echo -e "$pkgs")
+
 	msg "Show Configuration" "
 ---------- PARTITION CONFIGURATION ------------
 
@@ -499,8 +512,8 @@ select_show()
   Extra Mounts:   ${EXMNTS:-none}
   Mkinit Hooks:   ${HOOKS:-none}
 
-  LVM used:   ${LVM:-unused}
-  LUKS used:  ${LUKS:-unused}
+  LVM used:   ${LVM:-none}
+  LUKS used:  ${LUKS:-none}
 
 ------------ SYSTEM CONFIGURATION -------------
 
@@ -523,7 +536,7 @@ select_show()
 
   Kernel:     ${KERNEL:-none}
   Bootloader: ${BOOTLDR:-none}
-  Packages:   ${pkgs:-none}
+  Packages:   ${fmtpkgs:-none}
 "
 }