rename MUTT_USE_SCREEN to MUTTJUMP_MULTI_SCREEN_MODE for clarity

[muttjump] / muttjump

diff --git a/muttjump b/muttjump
index 7ebc6397074e0e0561ccf1e486785b15399a38b3..4ec3d9126a3dd645eb2ac81cf96fdef04faee6c7 100755 (executable)
--- a/muttjump
+++ b/muttjump
@@ -28,7 +28,9 @@ MUTTJUMP_MODE=${MUTTJUMP_MODE:-search}
 # If this is set to "yes", muttjump will not open a new instance of
 # mutt, but instead jump to the original message in a running mutt
 # (which is running in a screen session).
-MUTTJUMP_USE_SCREEN=${MUTTJUMP_USE_SCREEN:-no}
+# ATTENTION: You need to have one mutt instance open for every mailbox
+#            for this to work!
+MUTTJUMP_MULTI_SCREEN_MODE=${MUTTJUMP_MULTI_SCREEN_MODE:-no}
 
 # name of the screen session (screen -S ...), leave blank for none
 MUTTJUMP_SCREEN_SESSION=${MUTTJUMP_SCREEN_SESSION:-}
@@ -58,6 +60,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 +77,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 +90,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)
@@ -135,7 +141,7 @@ fi
 
 jump_expr="~i'$msgid'"
 
-if [ "$MUTTJUMP_USE_SCREEN" = no ] ; then
+if [ "$MUTTJUMP_MULTI_SCREEN_MODE" = no ] ; then
 
     jump_cmd="<limit>$jump_expr<enter>"
     if [ "$MUTTJUMP_MODE" = search ] ; then