replace type -p with type

[muttjump] / muttjump

diff --git a/muttjump b/muttjump
index 25720f453eff2cb2b69634af1420ae21716764e8..cb7e4fbb3a726a1f163c73d7d9aa1ca8eb8513c5 100755 (executable)
--- a/muttjump
+++ b/muttjump
@@ -24,17 +24,23 @@ MUTTJUMP_INDEXER=${MUTTJUMP_INDEXER:-}
 # "limit" or "search" (default)
 MUTTJUMP_MODE=${MUTTJUMP_MODE:-search}
 
+# "yes", "no" or "auto"
+# If set to "auto", the $STY environment variable is used for auto detection.
+MUTTJUMP_USE_SCREEN="auto"
+
 # "yes" or "no"
 # 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:-}
 
 # function to create the screen window name from the full path of the mailbox
-if ! type -p MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE >/dev/null ; then
+if ! type MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE >/dev/null 2>&1 ; then
     function MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE () {
         basename "$1"
     }
@@ -46,12 +52,22 @@ MAIRIX=${MAIRIX:-mairix}
 MU=${MU:-mu}
 NMZMAIL=${NMZMAIL:-nmzmail}
 SCREEN=${SCREEN:-screen}
+FORMAIL=${FORMAIL:-formail}
+REFORMAIL=${REFORMAIL:-reformail}
 
 function die () {
     echo -e >&2 "$0: $1"
     exit 1
 }
 
+function quote () {
+    echo \'${1//\'/\'\\\'\'}\'
+}
+
+function is_callable () {
+    type $1 >/dev/null 2>&1
+}
+
 # Check command-line arguments and STDIN
 if tty -s || [ $# -ne 0 ] ; then
     cat >&2 <<END
@@ -65,12 +81,26 @@ 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
 
+case $MUTTJUMP_MODE in
+    limit|search)
+        ;;
+    *)
+        die "variable MUTTJUMP_MODE must be set to \"limit\" or \"search\""
+        ;;
+esac
+
 # search for Message-ID in STDIN
-msgid=$(sed -n 's/^Message-ID: \(.*\)/\1/Ip' | head -n1)
+if is_callable $FORMAIL ; then
+    msgid=$($FORMAIL -c -z -x Message-ID | head -n1)
+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)
+fi
 if [ -z "$msgid" ] ; then
     die "could not find Message-ID header in standard input"
 fi
@@ -108,37 +138,60 @@ if [ -z "$orig_msgfile" -o ! -e "$orig_msgfile" ] ; then
 fi
 
 # get containing maildir of $orig_msgfile
-orig_maildir=$(dirname $(dirname "$orig_msgfile"))
+orig_maildir=$(dirname "$(dirname "$orig_msgfile")")
 if [ ! -d "$orig_maildir/cur" ] ; then
-    die "directory \"$orig_maildir\" doesn't exist or is no Maildir"
+    die "directory $(quote "$orig_maildir") doesn't exist or is no Maildir"
 fi
 
-jump_cmd="<change-folder>$orig_maildir<enter><$MUTTJUMP_MODE>~i $msgid<enter>"
+jump_expr="~i'$msgid'"
+
+if [ "$MUTTJUMP_MULTI_SCREEN_MODE" = no ] ; then
+
+    jump_cmd="<limit>$jump_expr<enter>"
+    if [ "$MUTTJUMP_MODE" = search ] ; then
+        jump_cmd="$jump_cmd<limit>all<enter>"
+    fi
 
-if [ "$MUTTJUMP_USE_SCREEN" = no ] ; then
+    if [ "$MUTTJUMP_USE_SCREEN" = auto -a -n "$STY" ] ; then
+        MUTTJUMP_USE_SCREEN=yes
+    fi
 
-    # Close message-stdin and open terminal-stdin instead.
-    # mutt behaves different if STDIN is no terminal
-    # TODO: Find cleaner solution (e.g. mutt command-line argument?)
-    exec 0<&-
-    term="/dev/$(ps -p$$ --no-heading | awk '{print $2}')"
-    exec < $term
+    screen_opts=()
+    if [ "$MUTTJUMP_USE_SCREEN" = yes ] ; then
+        [ -n "$STY" ] && screen_opts=("-X" "screen")
+        screen_window_name=$(MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE "$orig_maildir")
+        screen_opts=("${screen_opts[@]}" "-t" "$screen_window_name")
+    else
+        SCREEN=""
+        # Close message-stdin and open terminal-stdin instead.
+        # mutt behaves different if STDIN is no terminal
+        # TODO: Find cleaner solution (e.g. mutt command-line argument?)
+        exec 0<&-
+        term="/dev/$(ps -p$$ -otty=)"
+        exec < $term
+    fi
 
     # start mutt, open original folder and jump to the original message
-    $MUTT -e "push \"$jump_cmd\""
+    $SCREEN "${screen_opts[@]}" $MUTT -f "$orig_maildir" -e "push \"$jump_cmd\""
 
 else
 
+    jump_cmd="l$jump_expr\r"
+    if [ "$MUTTJUMP_MODE" = search ] ; then
+        jump_cmd="${jump_cmd}lall\r"
+    fi
+
     screen_window_name=$(MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE "$orig_maildir")
-    screen_opts=""
+    screen_opts=()
     if [ -n "$MUTTJUMP_SCREEN_SESSION" ] ; then
-        screen_opts="-S $MUTTJUMP_SCREEN_SESSION"
+        screen_opts=("-S" "$MUTTJUMP_SCREEN_SESSION")
+        screen_opts_str="-S $(quote "$MUTTJUMP_SCREEN_SESSION")"
     fi
 
-    $SCREEN $screen_opts -X eval "select $screen_window_name" "stuff ':push \"$jump_cmd\"
-'"
+    $SCREEN "${screen_opts[@]}" -p "$screen_window_name" -X eval "select '$screen_window_name'" "stuff \"$jump_cmd\""
+
     if [ $? != 0 ] ; then
         die "You have to manually start a screen session with:
-$SCREEN $screen_opts -t $screen_window_name $MUTT -f \"$orig_maildir\""
+$SCREEN $screen_opts_str -t $(quote "$screen_window_name") $MUTT -f $(quote "$orig_maildir")"
     fi
 fi