X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=quickconfig%2F030-wm.sh;h=cc3bd99e67eba9994c7deb4c79fdbae993039e8a;hb=915c44c17d8a8f504ff88477a7264632445063c4;hp=a2a34a63531b88af18666de3f544e4dbd06ad8dc;hpb=72b9c06c6835b4d5b978226a9389a737637d20e8;p=grml-quickconfig.git diff --git a/quickconfig/030-wm.sh b/quickconfig/030-wm.sh index a2a34a6..cc3bd99 100644 --- a/quickconfig/030-wm.sh +++ b/quickconfig/030-wm.sh @@ -1,10 +1,12 @@ # 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 {{{ @@ -22,6 +24,7 @@ wms=( v fvwm 2 fvwm2 c fvwm-crystal + 3 i3 j jwm o openbox k pekwm @@ -38,10 +41,11 @@ wms=( print_available_wm() { . /etc/grml/script-functions 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)#value} + $LEN)) -ge $(($MAXLEN-9)) ] ; then @@ -51,6 +55,7 @@ print_available_wm() { fi line+="$(highlight_char $value $key) " LEN=$((${(c)#value} + $LEN)) + AVAILABLE_WM_COUNT=$(($AVAILABLE_WM_COUNT + 1)) fi done output+="$line" @@ -68,6 +73,10 @@ wm_heading() { # print windowm manager loop {{{ wm_menu() { + if [ $AVAILABLE_WM_COUNT == 1 ]; then + run su grml -c "grml-x" + return + fi echo wm_heading for line in ${output} ; do