Merge branch 'master' into fix-xmonad

fet.sh

@@ -47,7 +47,7 @@ if [ -e /proc/$$/comm ]; then
 		for i in /proc/*/comm; do
 			read -r c < "$i"
 			case $c in
-				awesome|xmonad*|qtile|i3*|*box*|*wm*) wm="$c"; break;;
+				awesome|xmonad*|qtile|i3*|*box*|*wm*) wm="${c%%-*}"; break;;
 			esac
 		done