projects
/
grml-scripts.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
grml-exec-wrapper: do not use print
[grml-scripts.git]
/
usr_bin
/
grml-exec-wrapper
diff --git
a/usr_bin/grml-exec-wrapper
b/usr_bin/grml-exec-wrapper
index
6ea449d
..
8159246
100755
(executable)
--- a/
usr_bin/grml-exec-wrapper
+++ b/
usr_bin/grml-exec-wrapper
@@
-28,7
+28,7
@@
display_info() {
if is_installed Xdialog && test -n "$DISPLAY" ; then
Xdialog --title "grml-exec-wrapper" --msgbox "$1" 0 0 0
else
if is_installed Xdialog && test -n "$DISPLAY" ; then
Xdialog --title "grml-exec-wrapper" --msgbox "$1" 0 0 0
else
- print "$1">&2
+ print
f '%s\n'
"$1">&2
fi
}
fi
}
@@
-37,19
+37,18
@@
if [ -z "$1" ] ; then
exit 1
fi
exit 1
fi
-RC='0'
PROG="$1"
# make sure to support 'grml-exec-wrapper sudo wireshark' as well:
case $PROG in
PROG="$1"
# make sure to support 'grml-exec-wrapper sudo wireshark' as well:
case $PROG in
-
*sudo*) PROG="$2" ;;
+ *sudo*) PROG="$2" ;;
esac
if is_installed "$PROG" ; then
esac
if is_installed "$PROG" ; then
- exec
$@
-else
- RC=1
-
display_info "Sorry: ${PROG} not available.
+ exec
"$@"
+fi
+
+display_info "Sorry: ${PROG} not available.
Looks like the grml flavour you are using does not ship ${PROG}. :(
Looks like the grml flavour you are using does not ship ${PROG}. :(
@@
-57,8
+56,7
@@
You can search for ${PROG} executing:
apt-get update && apt-cache search ${PROG}
"
apt-get update && apt-cache search ${PROG}
"
-fi
-exit
$RC
+exit
1
## END OF FILE #################################################################
## END OF FILE #################################################################