From fe1749bed51806a948ab385071b62c3e5f75e0bf Mon Sep 17 00:00:00 2001
From: natemaia <natemaia10@gmail.com>
Date: Sat, 1 Sep 2018 13:00:39 -0700
Subject: [PATCH] Fix regressions from recent changes

---
 src/archlabs-installer | 12 +++++++-----
 src/lib/install.sh     |  2 +-
 src/lib/mount.sh       |  2 +-
 src/lib/utils.sh       |  2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/archlabs-installer b/src/archlabs-installer
index 4c7a571..d70544c 100755
--- a/src/archlabs-installer
+++ b/src/archlabs-installer
@@ -12,7 +12,7 @@
 # immutable variables {
 
 readonly DIST="ArchLabs"                      # Linux distributor
-readonly VER="1.6.69"                         # Installer version
+readonly VER="1.6.70"                         # Installer version
 readonly LIVE="liveuser"                      # Live session user
 readonly MNT="/mnt/install"                   # Install mountpoint
 readonly ERR="/tmp/errlog"                    # Built-in error log
@@ -298,7 +298,7 @@ window_manager() {
     for wm in $INSTALL_WMS; do
         LOGIN_CHOICES="${LOGIN_CHOICES}$wm - "
         case $wm in
-            openbox)  WM_PACKAGES="$WM_PACKAGES $wm obconf archlabs-obkey archlabs-kickshaw archlabs-skippy-xd tint2 conky" ;;
+            openbox)  WM_PACKAGES="$WM_PACKAGES $wm obconf archlabs-obkey archlabs-kickshaw archlabs-skippy-xd tint2 conky jgmenu" ;;
             bspwm)    WM_PACKAGES="$WM_PACKAGES $wm sxhkd" ;;
             i3-gaps)  WM_PACKAGES="$WM_PACKAGES $wm i3status perl-anyevent-i3" ;;
             gnome)    WM_PACKAGES="$WM_PACKAGES $wm gnome-extra" ;;
@@ -308,9 +308,9 @@ window_manager() {
     done
 
     if [[ $INSTALL_WMS =~ (openbox|bspwm|i3-gaps) ]]; then
-        WM_PACKAGES="$WM_PACKAGES termite thunar archlabs-polybar archlabs-screenlock archlabs-oblogout lxappearance"
+        WM_PACKAGES="$WM_PACKAGES archlabs-polybar jsoncpp libmpdclient archlabs-screenlock archlabs-oblogout archlabs-paranoid lxappearance rofi termite thunar"
     elif [[ $INSTALL_WMS =~ (xfce4) ]]; then
-        WM_PACKAGES="$WM_PACKAGES archlabs-oblogout archlabs-screenlock"
+        WM_PACKAGES="$WM_PACKAGES archlabs-oblogout archlabs-screenlock archlabs-paranoid"
     fi
 
     # choose which to login
@@ -596,6 +596,9 @@ main() {
     esac
 }
 
+# must be done first
+init_variables
+
 for file in /usr/share/archlabs/installer/lib/?*.sh; do
     source_file $file
 done
@@ -607,7 +610,6 @@ for arg in $@; do case $arg in
     --debug|-d) debug ;;
 esac done
 
-init_variables
 select_language
 setup_keymap
 check_requirements
diff --git a/src/lib/install.sh b/src/lib/install.sh
index d20efa4..1f016ab 100644
--- a/src/lib/install.sh
+++ b/src/lib/install.sh
@@ -146,7 +146,7 @@ create_user() {
 
     sed -i "s/${LIVE}/${NEWUSER}/g" $_home/.config/gtk-3.0/bookmarks $_home/.mozilla/firefox/archlabs.default/{prefs,sessionstore}.js
 
-    ! [[ $INSTALL_WMS =~ openbox ]] && rm -rf $_home/.config/{openbox}
+    ! [[ $INSTALL_WMS =~ openbox ]] && rm -rf $_home/.config/{openbox,skippy-xd,jgmenu,conky,tint2}
     ! [[ $INSTALL_WMS =~ bspwm   ]] && rm -rf $_home/.config/{bspwm,sxhkd}
     ! [[ $INSTALL_WMS =~ i3-gaps ]] && rm -rf $_home/.config/i3
 
diff --git a/src/lib/mount.sh b/src/lib/mount.sh
index a21e9ab..b0cc631 100644
--- a/src/lib/mount.sh
+++ b/src/lib/mount.sh
@@ -352,7 +352,7 @@ select_swap() {
     # Ask user to select partition or create swapfile
     tput civis
     SWAP="$(dialog --backtitle "$BT" --cr-wrap --stdout --title " $_SelSwpSetup " \
-        --menu "$_SelSwpBody" 0 0 0 "$_SelSwpNone" "-" "$_SelSwpFile" "-" $PARTS)"
+        --menu "$_SelSwpBody" 0 0 0 "$_SelSwpNone" "-" "$_SelSwpFile" "${SYS_MEM}M" $PARTS)"
     [[ $? != 0 || $SWAP == "$_SelSwpNone" ]] && return 0
 
     if [[ $SWAP == "$_SelSwpFile" ]]; then
diff --git a/src/lib/utils.sh b/src/lib/utils.sh
index d3698c3..30fa53f 100644
--- a/src/lib/utils.sh
+++ b/src/lib/utils.sh
@@ -71,7 +71,7 @@ check_for_errors() {
         msg="$([[ $err == "" ]] && echo -n "$msg")\n$_ErrChoiceConsole"
         yesno "$_ErrTitle" "$msg" "Exit & Open Log" "Ignore & Continue" && { less /tmp/debug-log; die 0; }
     else
-        yesno "$_ErrTitle" "$msg" "Exit & Shutdown" "Ignore & Continue" && die 'shutdown'
+        yesno "$_ErrTitle" "$msg" "Exit & Shutdown" "Ignore & Continue" && die 'shutdown -h now'
     fi
 
     return 0