X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=quickconfig%2F030-wm.sh;h=b9f460c4700e8e399984818fac203db3005f8acd;hb=5f0ac8e2b49fc413326a6f5c7f2843f63ffcc509;hp=be376edb2af765e715c0006a2d6372b8a4c6e421;hpb=64cc61f8747c958bd13b8fcf7f78274dc2241182;p=grml-quickconfig.git

diff --git a/quickconfig/030-wm.sh b/quickconfig/030-wm.sh
index be376ed..b9f460c 100644
--- a/quickconfig/030-wm.sh
+++ b/quickconfig/030-wm.sh
@@ -1,54 +1,61 @@
 # window manager module for grml-quickconfig
-LINE='print_line "Start ${HIGHLIGHT}x${NORMAL} (${HIGHLIGHT_NAME}grml-x${NORMAL})"'
+LINE='print_line "Start ^x (/grml-x/)"'
 KEY=(x)
 FUNCTION='wm_menu'
 
 display_entry() {
-    return 0
+    . /etc/grml/script-functions
+    check4progs grml-x >/dev/null 2>&1
+    return $?
 }
 
 # variable definition {{{
 typeset -A wms
 typeset -A available
-set -a output
+set -A output
 # }}}
 
 # window manager definition {{{
-wms[a]=awesome
-wms[d]=dwm
-wms[e]=evilwm
-wms[f]=fluxbox
-wms[v]=fvwm
-wms[2]=fvwm2
-wms[c]=fvwm-crystal
-wms[j]=jwm
-wms[o]=openbox
-wms[k]=pekwm
-wms[r]=ratpoison
-wms[t]=twm
-wms[9]=w9wm
-wms[w]=windowlab
-wms[i]=wmii
-wms[n]=wm-ng
+wms=(
+  a awesome
+  d dwm
+  e evilwm
+  f fluxbox
+  v fvwm
+  2 fvwm2
+  c fvwm-crystal
+  3 i3
+  j jwm
+  o openbox
+  k pekwm
+  r ratpoison
+  t twm
+  9 w9wm
+  w windowlab
+  i wmii
+  n wm-ng
+  )
 # }}}
 
 # deteremine installed window managers {{{
 print_available_wm() {
   . /etc/grml/script-functions
-  line=""
   LEN=0
+  AVAILABLE_WM_COUNT=0
+  local line
 
   for key value in ${(kv)wms} ; do
-    if check4progs $value >/dev/null ; then
+    if check4progs $value >/dev/null 2>&1 ; then
       available[$key]=$value
       # test if word could be added to current line
-      if [ $[${(c)#key} + $LEN] -lt $MAXLEN ] ; then
-        LEN+=${(c)#wm}
-        line+="$(highlight_char $value $key) "
-      else
+      if [ $((${(c)#value} + $LEN)) -ge $(($MAXLEN-9)) ] ; then
         LEN=0
         output+="$line"
+        line=""
       fi
+      line+="$(highlight_char $value $key) "
+      LEN=$((${(c)#value} + $LEN))
+      AVAILABLE_WM_COUNT=$(($AVAILABLE_WM_COUNT + 1))
     fi
   done
   output+="$line"
@@ -66,9 +73,15 @@ wm_heading() {
 
 # print windowm manager loop {{{
 wm_menu() {
+  if [ $AVAILABLE_WM_COUNT == 1 ]; then
+    chgrp tty "$TTY"
+    chmod g+rw "$TTY"
+    run sudo -u grml grml-x
+    return
+  fi
   echo
   wm_heading
-  for line in $output ; do
+  for line in ${output} ; do
     print_line $line
   done
   print_closing_line
@@ -77,7 +90,9 @@ wm_menu() {
   get_key INPUT
   case $INPUT in
     [${(k)available}])
-    run su - grml -c "grml-x ${available[$INPUT]}"
+    chgrp tty "$TTY"
+    chmod g+rw "$TTY"
+    run sudo -u grml -c "grml-x ${available[$INPUT]}"
     ;;
   esac
 }