From c815cb7f027705b5046c51ed87e54e39b652a397 Mon Sep 17 00:00:00 2001
From: natemaia <natemaia10@gmail.com>
Date: Fri, 14 Dec 2018 00:19:42 -0800
Subject: [PATCH] Change root shell, more package install clean up

---
 src/lib/dialogs.sh | 32 +++++++++++++++++---------------
 src/lib/install.sh |  1 +
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/lib/dialogs.sh b/src/lib/dialogs.sh
index 3d6d2fb..cd13a31 100644
--- a/src/lib/dialogs.sh
+++ b/src/lib/dialogs.sh
@@ -49,13 +49,15 @@ declare -gA WM_SESSIONS=(
 )
 
 # additional packages installed for the given window manager
+rp="rofi archlabs-polybar"
 declare -gA WM_EXT=(
 [gnome]="gnome-extra"
-[bspwm]="sxhkd archlabs-skel-bspwm rofi archlabs-screenlock archlabs-polybar"
-[i3-gaps]="i3status perl-anyevent-i3 archlabs-skel-i3-gaps rofi archlabs-screenlock archlabs-polybar"
+[bspwm]="sxhkd archlabs-skel-bspwm $rp"
+[i3-gaps]="i3status perl-anyevent-i3 archlabs-skel-i3-gaps $rp"
+[openbox]="obconf archlabs-skel-openbox jgmenu tint2 conky $rp"
 [xfce4]="xfce4-goodies xfce4-pulseaudio-plugin archlabs-skel-xfce4"
-[openbox]="archlabs-obkey obconf archlabs-kickshaw archlabs-oblogout jgmenu archlabs-skel-openbox tint2 archlabs-skippy-xd conky archlabs-screenlock rofi archlabs-paranoid archlabs-polybar"
 )
+unset rp
 
 # files the user can edit during the final stage of install
 declare -gA EDIT_FILES=(
@@ -88,18 +90,18 @@ show_cfg()
   Swap:  ${SWAP_PART:-None}
   Size:  ${SWAP_SIZE:-None}
 
-  Extra: ${EXTRA_MNTS:-${EXTRA_MNT:-None}}
-  Hooks: ${MKINIT_HOOKS:-None}
-
   LVM:   ${LVM:-None}
   LUKS:  ${LUKS:-None}
 
+  Extra Mounts: ${EXTRA_MNTS:-${EXTRA_MNT:-None}}
+  Mkinit Hooks: ${MKINIT_HOOKS:-None}
+
 
 ---------- BOOTLOADER CONFIGURATION -----------
 
-  Loader:  ${BOOTLDR:-None}
-  Mount:   ${mnt:-None}
-  Command: ${cmd:-None}
+  Bootloader: ${BOOTLDR:-None}
+  Mountpoint: ${mnt:-None}
+  Command:    ${cmd:-None}
 
 
 ------------ SYSTEM CONFIGURATION -------------
@@ -110,13 +112,13 @@ show_cfg()
   Timezone: ${ZONE:-None}/${SUBZONE:-None}
 
 
------------- LOGIN CONFIGURATION --------------
+------------ USER CONFIGURATION --------------
 
-  User:       ${NEWUSER:-None}
-  Shell:      ${MYSHELL:-None}
-  Session:    ${LOGIN_WM:-None}
-  Autologin:  ${AUTOLOGIN:-None}
-  Management: ${LOGIN_TYPE:-None}
+  User:         ${NEWUSER:-None}
+  Shell:        ${MYSHELL:-None}
+  Session:      ${LOGIN_WM:-None}
+  Autologin:    ${AUTOLOGIN:-None}
+  Login Method: ${LOGIN_TYPE:-None}
 
 
 ------------ PACKAGES AND MIRRORS -------------
diff --git a/src/lib/install.sh b/src/lib/install.sh
index 666e80f..68b2c52 100644
--- a/src/lib/install.sh
+++ b/src/lib/install.sh
@@ -178,6 +178,7 @@ create_user()
 {
     # set root password
     chrun "chpasswd <<< 'root:$ROOT_PASS'"
+    [[ $MYSHELL == *zsh ]] || chrun "usermod -s $MYSHELL root"
 
     local groups='audio,autologin,floppy,log,network,rfkill,scanner,storage,optical,power,wheel'