From 62fc28127af60bc3c76d210b99bc927e131ba1f6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Johannes=20Wei=C3=9Fl?= Date: Tue, 30 Nov 2010 02:37:25 +0100 Subject: [PATCH] allow program paths to contain arguments e.g. MUTT="mutt -F /my/config" --- muttjump | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/muttjump b/muttjump index 7ebc639..8170f4e 100755 --- a/muttjump +++ b/muttjump @@ -58,6 +58,11 @@ function quote () { echo \'${1//\'/\'\\\'\'}\' } +function is_callable () { + read cmd args <<<$1 + type -p $cmd >/dev/null +} + # Check command-line arguments and STDIN if tty -s || [ $# -ne 0 ] ; then cat >&2 </dev/null ; then +if ! is_callable $MUTT ; then die "$MUTT is not in PATH, set MUTT variable" fi @@ -84,9 +89,9 @@ case $MUTTJUMP_MODE in esac # search for Message-ID in STDIN -if type -p $FORMAIL >/dev/null ; then +if is_callable $FORMAIL ; then msgid=$($FORMAIL -c -z -x Message-ID | head -n1) -elif type -p $REFORMAIL >/dev/null ; then +elif is_callable $REFORMAIL ; then msgid=$($REFORMAIL -c -x Message-ID: | head -n1) else msgid=$(sed -n 's/^Message-ID:[ \t]*\(.*\)/\1/Ip' | head -n1) -- 2.30.2