From: Johannes Weißl <jargon@molb.org>
Date: Thu, 2 Dec 2010 11:26:15 +0000 (+0100)
Subject: add possibility to specify msgid as argument + reply-to mode
X-Git-Url: https://projects.mako.cc/source/muttjump/commitdiff_plain/95f0235d5cc8121a08d7f02f7a1c3a489697573d?ds=sidebyside

add possibility to specify msgid as argument + reply-to mode
---

diff --git a/muttjump b/muttjump
index efdfb20..4ba392f 100755
--- a/muttjump
+++ b/muttjump
@@ -70,16 +70,31 @@ function is_callable () {
     type $1 >/dev/null 2>&1
 }
 
-# Check command-line arguments and STDIN
-if tty -s || [ $# -ne 0 ] ; then
+function usage () {
     cat >&2 <<END
-Usage: $0 < msg
+Usage: muttjump msgid
+       cat msg | muttjump [-R]
 
-This script calls mutt, jumping to the message given in stdin.
-Uses a mail search engine (currently mairix, mu and nmzmail are supported),
+This script calls mutt, jumping to the message given in stdin or to the message
+identified by "msgid".  With "-R", it jumps to the message being replied to.
+It uses a mail search engine (currently mairix, mu and nmzmail are supported),
 which has to be configured through MUTTJUMP_INDEXER variable.
 END
     exit 1
+}
+
+
+# Check command-line arguments and STDIN
+search_header="Message-ID"
+if tty -s ; then
+    [ $# -ne 1 ] && usage
+else
+    [ $# -gt 1 ] && usage
+    if [ $# -eq 1 ] ; then
+        [ "$1" != "-R" ] && usage
+        search_header="In-Reply-To"
+        shift
+    fi
 fi
 
 # check if mutt is installed
@@ -103,17 +118,19 @@ case $MUTTJUMP_MODE in
 esac
 
 # search for Message-ID in STDIN
-if is_callable $FORMAIL ; then
-    msgid=$($FORMAIL -c -z -x Message-ID | head -n1)
+if [ $# -eq 1 ] ; then
+    msgid=$1
+elif is_callable $FORMAIL ; then
+    msgid=$($FORMAIL -c -z -x $search_header | head -n1)
 elif is_callable $REFORMAIL ; then
-    msgid=$($REFORMAIL -c -x Message-ID: | head -n1)
+    msgid=$($REFORMAIL -c -x $search_header: | head -n1)
 else
-    msgid=$(sed -n 's/^Message-ID:[ \t]*\(.*\)/\1/Ip' | head -n1)
+    msgid=$(sed -n 's/^'$search_header':[ \t]*\(.*\)/\1/Ip' | head -n1)
 fi
 if [ -z "$msgid" ] ; then
-    die "could not find Message-ID header in standard input"
+    die "could not find $search_header header in standard input"
 fi
-msgid_clean=$(echo "$msgid" | sed 's/^<\(.*\)>$/\1/')
+msgid_clean=$(echo "$msgid" | sed -e 's/^<//' -e 's/>$//')
 
 # try to locate path of message using a mail search engine
 case $MUTTJUMP_INDEXER in