grml-info: improve support for customisation

diff --git a/debian/changelog b/debian/changelog
index 1ac815d..85e2af3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+grml-scripts (1.2.7) unstable; urgency=low
+
+  * grml-info: improve support for customisation through
+    /usr/share/doc/${distri}-docs/index.html, redirect warnings
+    to /dev/null, support gdialog and zenity for info text display.
+
+ -- Michael Prokop <mika@grml.org>  Sun, 21 Feb 2010 00:28:28 +0100
+
 grml-scripts (1.2.6) unstable; urgency=low
 
   * grml-lock: add support for graphical version via gdialog/zenity.

diff --git a/usr_bin/grml-info b/usr_bin/grml-info
index 005be75..1f31776 100755 (executable)
--- a/usr_bin/grml-info
+++ b/usr_bin/grml-info
@@ -1,65 +1,81 @@
 #!/bin/zsh
 # Filename:      grml-info
-# Purpose:       start browser with documentation for grml
+# Purpose:       start browser with documentation for Grml (based) system
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
 ################################################################################
 
-local PAGE='/usr/share/doc/grml-docs/startpage.html'
+# allow customisation
+[ -n "$distri" ] || distri=grml
+
+if [ -r "/usr/share/doc/${distri}-docs/index.html" ] ; then
+  # support easy customisation, file doesn't exist
+  # by default on mainline Grml
+  local PAGE="/usr/share/doc/${distri}-docs/index.html"
+else
+  local PAGE='/usr/share/doc/grml-docs/startpage.html'
+fi
 
 . /etc/grml/script-functions
 
 # do we have X?
-if [ -n "$DISPLAY" ]; then
-   if check4progs dillo ; then
-      dillo $PAGE
-   elif check4progs xlinks2 ; then
-      xlinks2 -mode 640x480 $PAGE
-   elif check4progs firefox ; then
-      firefox $PAGE
-   elif check4progs x-www-browser ; then
-      x-www-browser $PAGE
-   elif check4progs Xdialog ; then
-      Xdialog --msgbox "Sorry, no usable X browser found." 0 0
+if [ -n "$DISPLAY" ] ; then
+   if check4progs dillo &>/dev/null ; then
+     dillo $PAGE
+   elif check4progs xlinks2 &>/dev/null ; then
+     xlinks2 -mode 640x480 $PAGE
+   elif check4progs firefox &>/dev/null ; then
+     firefox $PAGE
+   elif check4progs x-www-browser &>/dev/null ; then
+     x-www-browser $PAGE
+   elif check4progs Xdialog &>/dev/null ; then
+     Xdialog --msgbox "Sorry, no usable X browser (dillo, xlinks2, firefox,...) found." 0 0
+     exit 1
+   elif check4progs gdialog &>/dev/null ; then
+     gdialog --msgbox "Sorry, no usable X browser (dillo, xlinks2, firefox,...) found." 0 0
+     exit 1
+   elif check4progs zenity &>/dev/null ; then
+     zenity --info --text="Sorry, no usable X browser (dillo, xlinks2, firefox,...) found."
+     exit 1
    fi
 else # no X:
    # do we have a real console?
    if [[ $(tty) == /dev/tty* ]] ; then
       # do we have framebuffer support?
       if [ -c /dev/fb0 ] ; then
-         if check4progs links2 ; then
+         if check4progs links2 &>/dev/null ; then
             links2 -driver fb $PAGE
-         elif check4progs w3m ; then
+         elif check4progs w3m &>/dev/null; then
             w3m $PAGE
-         elif check4progs links ; then
+         elif check4progs links &>/dev/null ; then
             links $PAGE
          else
             echo "Sorry, neither links2 nor w3m nor links available. Exiting.">&2
-            exit 20
+            exit 1
          fi
       else # no, we don't have framebuffer
-         if check4progs w3m ; then
+         if check4progs w3m &>/dev/null ; then
             w3m $PAGE
-         elif check4progs links ; then
+         elif check4progs links &>/dev/null ; then
             links $PAGE
-         elif check4progs links2 ; then
+         elif check4progs links2 &>/dev/null ; then
             links2 $PAGE
          else
             echo "Sorry, neither w3m nor links nor links2 available. Exiting.">&2
-            exit 30
+            exit 1
          fi
       fi
    else # no, probably we are running inside GNU screen
-      if check4progs w3m ; then
+      if check4progs w3m &>/dev/null ; then
          w3m $PAGE
-      elif check4progs links2 ; then
+      elif check4progs links2 &>/dev/null ; then
          links2 $PAGE
-      elif check4progs links ; then
+      elif check4progs links &>/dev/null ; then
          links $PAGE
       else
          echo "Sorry, neither w3m nor links2 nor links available. Exiting.">&2
-         exit 40
+         exit 1
       fi
    fi
 fi