X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=usr_bin%2Fwm-ng;h=d8fc87a3aeb9f83aa9c7d1f7c2e6788fffa2e17d;hb=1d186c2dbdcab468b993afe3af78550030979562;hp=ef17089db750dfc8dab025dfb9bfc81d1b24733e;hpb=e720deae78f1eda5e6f62629606c194f16796762;p=grml-scripts.git

diff --git a/usr_bin/wm-ng b/usr_bin/wm-ng
index ef17089..d8fc87a 100755
--- a/usr_bin/wm-ng
+++ b/usr_bin/wm-ng
@@ -1,17 +1,24 @@
 #!/bin/sh
 # Filename:      wm-ng
 # Purpose:       a wrapper script to call fluxbox with some additional features activated
-# Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
+# Authors:       grml-team (grml.org)
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Thu Nov 03 15:32:49 CET 2005 [mika]
 ################################################################################
 
-/usr/bin/gkrellm   &   # -w
-
-(sleep 2; idesk &) &
-
-/usr/bin/fluxbox
+# start Grml's fluxbox setup only if fluxbox is present
+if [ -x "$(which fluxbox 2>/dev/null)" ] ; then
+  gkrellm -g -1+26 &
+  (sleep 2; idesk &) &
+  fluxbox
+elif [ "$(basename $(readlink -f $(which x-window-manager 2>/dev/null)))" != "fluxbox" ] && \
+     [ "$(basename $(readlink -f $(which x-window-manager 2>/dev/null)))" != "$(basename $0)" ] ; then
+    # fall back unless it's set to fluxbox or points back to wm-ng
+    x-window-manager
+else
+  echo "Error: fluxbox not present + x-window-manager is not an alternative neither." >&2
+  exit 1
+fi
 
 exit $?