Merge branch 'devel' of github.com:manjaro/manjaro-tools

Makefile

@@ -1,4 +1,4 @@
-Version=0.11.3
+Version=0.11.4
 
 PREFIX = /usr/local
 SYSCONFDIR = /etc

data/desktop.map

@@ -1,4 +1,9 @@
 openbox:openbox-session
+bspwm:bspwm-session
+jwm:jwm
+i3:i3
+fluxbox:startfluxbox
+pekwm:pekwm
 plasma:startkde
 gnome:gnome-session
 xfce:startxfce4
@@ -7,9 +12,6 @@ mate:mate-session
 enlightenment:enlightenment_start
 LXDE:lxsession
 lxqt:lxqt-session
-pekwm:pekwm
 pantheon:pantheon-session
 budgie-desktop:budgie-desktop
-i3:i3
-fluxbox:startfluxbox
 deepin:startdde

lib/util-iso-image.sh

@@ -376,7 +376,7 @@ configure_root_image(){
 configure_custom_image(){
 	msg "Configuring [%s-image]" "${profile}"
 	configure_plymouth "$1"
-	configure_displaymanager "$1"
+	[[ ${displaymanager} != 'none' ]] && configure_displaymanager "$1"
 	configure_services "$1"
 	msg "Done configuring [%s-image]" "${profile}"
 }