is_callable: simpler solution

[muttjump] / muttjump

diff --git a/muttjump b/muttjump
index 7ebc6397074e0e0561ccf1e486785b15399a38b3..74f69d13bade6bbb351d2144f5174bde1cd6c3a1 100755 (executable)
--- a/muttjump
+++ b/muttjump
@@ -58,6 +58,10 @@ function quote () {
     echo \'${1//\'/\'\\\'\'}\'
 }
 
+function is_callable () {
+    type -p $1 >/dev/null
+}
+
 # Check command-line arguments and STDIN
 if tty -s || [ $# -ne 0 ] ; then
     cat >&2 <<END
@@ -71,7 +75,7 @@ END
 fi
 
 # check if mutt is installed
-if ! type -p $MUTT >/dev/null ; then
+if ! is_callable $MUTT ; then
     die "$MUTT is not in PATH, set MUTT variable"
 fi
 
@@ -84,9 +88,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)