X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=usr_bin%2Fgrml-exec-wrapper;h=d3ff8eeec350613c0a38ddfaca2f608fdf3bef49;hb=5b0c6b200fe0a76b7a78c984733defdb3120ea6a;hp=a826be1fdd9ece15151596e3121a0379bb216137;hpb=37bccb45ba7b9351a2fcc9f6c3a1f19f6b58ec99;p=grml-scripts.git

diff --git a/usr_bin/grml-exec-wrapper b/usr_bin/grml-exec-wrapper
index a826be1..d3ff8ee 100755
--- a/usr_bin/grml-exec-wrapper
+++ b/usr_bin/grml-exec-wrapper
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # Filename:      grml-exec-wrapper
 # Purpose:       simple but smart program execution wrapper
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
@@ -6,42 +6,83 @@
 # License:       This file is licensed under the GPL v2 or any later version.
 ################################################################################
 
+usage() {
+  printf "Usage: $0 <program> [<arguments>]
+
+Available options:
+
+  -h | --help   display this usage information
+  -p <program>  check specified argument instead of default args, like:
+                $(basename $0) -p aumix xterm -T aumix -e aumix
+"
+}
+
+is_installed() {
+    prog="$1"
+    [ -z "$prog" ] && return 1
+
+    case "${prog}" in
+        /*) # deal with absolute-path programs
+            [ -x "${prog}" ] && return 0
+            return 1 ;;
+    esac
+
+    ret=1
+    oifs="$IFS"
+    IFS=:
+    for dir in $PATH; do
+        [ -z "$dir" ] && continue
+        [ -x "$dir/$prog" ] && ret=0 && break
+    done
+
+    IFS="$oifs"
+    unset oifs
+    return "$ret"
+}
+
 # use Xdisplay only if present and running under X:
 display_info() {
-if type -a Xdialog 1>/dev/null 2>&1 && test -n "$DISPLAY" ; then
-    Xdialog --title "grml-exec-wrapper" --msgbox "$1" 0 0 0
+if is_installed xterm && test -n "$DISPLAY" ; then
+    xterm -T 'Sorry :(' -e "dialog --msgbox \"$1\" 0 0"
 else
-    print "$1">&2
+    printf '%s\n' "$1">&2
 fi
 }
 
-if [ -z "$1" ] ; then
-    display_info "Usage: $0 <program> [<arguments>]"
+if [ -z "$1" -o "$1" = '-h' -o "$1" = '--help' ] ; then
+    usage
     exit 1
 fi
 
-RC='0'
-PROG="$1"
+if [ "$1" = '-p' ] ; then
+    if [ -z "$2" ] ; then
+         usage
+         exit 1
+    else
+         PROG="$2"
+         shift ; shift
+    fi
+else
+    PROG="$1"
+    # make sure to support 'grml-exec-wrapper sudo wireshark' as well:
+    case $PROG in
+      *sudo*) PROG="$2" ;;
+    esac
+fi
 
-# make sure to support 'grml-exec-wrapper sudo wireshark' as well:
-case $PROG in
-	*sudo*) PROG="$2" ;;
-esac
+if is_installed "$PROG" ; then
+    exec "$@"
+fi
 
-if type -a "$PROG" 1>/dev/null 2>&1 ; then
-    exec $@
-else
-    RC=1
-    display_info "Sorry: ${PROG} not available.
+display_info "Sorry: ${PROG} not available.
 
 Looks like the grml flavour you are using does not ship ${PROG}. :(
 
 You can search for ${PROG} executing:
 
-apt-get update && apt-cache search ${PROG}
+apt-get update && apt-cache search $(basename ${PROG})
     "
-fi
 
-exit $RC
+exit 1
 
 ## END OF FILE #################################################################