From ee17fd144acfb3f104577b3d3a2b1b99e4fc2294 Mon Sep 17 00:00:00 2001
From: natemaia <natemaia10@gmail.com>
Date: Sun, 25 Aug 2019 10:50:12 -0700
Subject: [PATCH] Move awesome install to be more inline with the rest

---
 archlabs-installer | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/archlabs-installer b/archlabs-installer
index f295543..2304efd 100755
--- a/archlabs-installer
+++ b/archlabs-installer
@@ -5,7 +5,7 @@
 # Some ideas and code reworked from other resources
 # AIF, Cnichi, Calamares, Arch Wiki.. Credit where credit is due
 
-VER="2.0.56"     # installer version
+VER="2.0.57"     # installer version
 DIST="ArchLabs"  # linux distributor
 MNT="/mnt"       # install mountpoint
 ANS="/tmp/ans"   # dialog answer file
@@ -164,8 +164,8 @@ declare -A WM_SESSIONS=(
 declare -A WM_EXT=(
 [dwm]=''                                    # NA
 [gnome]=''                                  # NA
-[awesome]=''                                # NA
 [plasma]='kdebase-meta'                     # base plasma application set
+[awesome]='archlabs-skel-awesome'           # see deps of archlabs-skel-awesome
 [bspwm]='archlabs-skel-bspwm'               # see deps of archlabs-skel-bspwm
 [fluxbox]='archlabs-skel-fluxbox'           # see deps of archlabs-skel-fluxbox
 [i3-gaps]='archlabs-skel-i3-gaps'           # see deps of archlabs-skel-i3-gaps
@@ -1540,7 +1540,7 @@ install_user()
 		cp -rfv $MNT/home/$NEWUSER/.vim/colors $MNT/home/$NEWUSER/.config/nvim/colors
 	fi
 
-	case $INSTALL_WMS in *awesome*) install_awesome ;; *dwm*) install_suckless ;; esac
+	[[ $INSTALL_WMS == *dwm* ]] && install_suckless
 
 	[[ $WM_PKGS == *xfce* ]] && echo 'volumeicon &' >> $MNT/home/$NEWUSER/.xprofile
 
@@ -1619,20 +1619,6 @@ install_lightdm()
 	EOF
 }
 
-install_awesome()
-{
-	# downloads and sets up @elenapan's awesome WM config hosted on github
-	if chrun "git clone https://github.com/elenapan/archlabs-awesome /home/$NEWUSER/archlabs-awesome"; then
-		cp -rT "/mnt/home/$NEWUSER/archlabs-awesome" "/mnt/home/$NEWUSER"
-		cp -rT "/mnt/home/$NEWUSER/archlabs-awesome" /mnt/etc/skel
-		rm -rf "/home/$NEWUSER/"{.git,archlabs-awesome,screenshots}
-		printf "You will need to install pamac separately using: 'baph -i pamac-aur'\n"
-		sleep 2
-	else
-		printf "failed to clone awesome config repo\n"
-	fi
-}
-
 install_packages()
 {
 	local rmpkg=""