From 78de4cbf9341cf4f48a155c846883d916cee5b4c Mon Sep 17 00:00:00 2001
From: natemaia <natemaia10@gmail.com>
Date: Sun, 27 Oct 2019 19:53:57 -0700
Subject: [PATCH] Clean up jwmrc

---
 archlabs-installer | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/archlabs-installer b/archlabs-installer
index 3d66e48..9280088 100755
--- a/archlabs-installer
+++ b/archlabs-installer
@@ -8,7 +8,7 @@
 # check for syntax errors
 # set -n
 
-VER=2.0.96
+VER=2.0.97
 
 # default values {
 
@@ -24,7 +24,6 @@ ERR=/tmp/errlog                    # stderr log used internally by errshow()
 DBG=/tmp/debuglog                  # debug log file when passed -d
 RUN=/run/archiso/bootmnt/arch/boot # path for live system /boot
 VM="$(dmesg | grep -i hypervisor)" # system running in a virtual machine
-TEARFREE=""                        # whether to install xorg configs and nvidia drivers
 EXMNTS=""                          # extra partitions that were mounted, used to verify mountpoint and show user
 FORMATTED=""                       # partitions that have been formatted, allows skipping the format step
 USER_CMD=""                        # optional command(s) entered by the user to run in the chroot
@@ -1350,8 +1349,8 @@ install_user()
 		install_suckless "/home/$NEWUSER" chroot
 		[[ $INSTALL_WMS == 'dwm' ]] && rm -rf "$MNT/home/$NEWUSER/.config/xfce4"
 	fi
-	[[ $INSTALL_WMS == *jwm* ]] && cp -rf "$MNT/etc/system.jwmrc" "$MNT/home/$NEWUSER/.jwmrc"
-	[[ $INSTALL_WMS != *bspwm* && $INSTALL_WMS != *openbox* ]] && rm -rf "$MNT/home/$NEWUSER/.config/"{jgmenu,tint2}
+	[[ $INSTALL_WMS == *jwm* ]] && sed '7,14d; s/xlock -mode blank/i3-lock-fancy -p/g; s/root:1/rofi_run/g' "$MNT/etc/system.jwmrc" > "$MNT/home/$NEWUSER/.jwmrc"
+	[[ $INSTALL_WMS =~ (bspwm|openbox) ]] || rm -rf "$MNT/home/$NEWUSER/.config/"{jgmenu,tint2}
 	[[ $USER_PKGS != *geany* ]] && rm -rf "$MNT/home/$NEWUSER/.config/geany"
 	[[ $MYSHELL != 'bash' ]] && rm -rf "$MNT/home/$NEWUSER/.bash"*
 	[[ $MYSHELL != 'zsh' ]] && rm -rf "$MNT/home/$NEWUSER/.z"*
@@ -1423,7 +1422,7 @@ install_packages()
 		rmpkg+="zsh "
 	fi
 
-	if [[ $INSTALL_WMS =~ (openbox|bspwm|i3-gaps|fluxbox) ]]; then
+	if [[ $INSTALL_WMS =~ (openbox|bspwm|i3-gaps|fluxbox|jwm) ]]; then
 		inpkg+="$WM_BASE_PKGS "
 	elif [[ $INSTALL_WMS == 'dwm' ]]; then # dwm only needs a very limited package set
 		inpkg+="nitrogen polkit-gnome gnome-keyring dunst "