In the absence of a dialog program use builtin select

[muttjump] / muttjump

diff --git a/muttjump b/muttjump
index efdfb207fd32470a9e1d63c2471f8b30a3cf92f5..28fb3a79579315c8cf3f031d60fae3d6a4433142 100755 (executable)
--- a/muttjump
+++ b/muttjump
@@ -36,9 +36,6 @@ MUTTJUMP_USE_SCREEN=${MUTTJUMP_USE_SCREEN:-auto}
 #            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 MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE >/dev/null 2>&1 ; then
     function MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE () {
@@ -70,16 +67,40 @@ 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
+}
+
+function reopen_tty () {
+    # 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
+}
+
+
+# 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 +124,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
@@ -152,8 +175,20 @@ if [ $count -gt 1 -a -n "$DIALOG_PROG" ] ; then
     orig_maildir=$($DIALOG_PROG --clear --title "More than one mailbox found" \
         --menu "Select mailbox:" $((count+8)) $((maxwidth+16)) \
         $count $choices 3>&2 2>&1 1>&3-)
+elif [ $count -gt 1 ] ; then
+    dirs=()
+    for f in $orig_msgfiles ; do
+        dirs=(${dirs[@]} "$(dirname "$(dirname "$f")")")
+    done
+    echo "More than one mailbox found"
+    echo "Select mailbox:"
+    select md in ${dirs[@]} ; do
+        orig_maildir="$md"
+        orig_msgfile="${orig_msgfiles[$REPLY]}"
+        break
+    done <> /dev/tty
 else
-    orig_msgfile=$(echo "$orig_msgfiles" | head -n1)
+    orig_msgfile="$orig_msgfiles"
     # get containing maildir of $orig_msgfile
     orig_maildir=$(dirname "$(dirname "$orig_msgfile")")
 fi
@@ -177,17 +212,16 @@ if [ "$MUTTJUMP_MULTI_SCREEN_MODE" = no ] ; then
 
     screen_opts=()
     if [ "$MUTTJUMP_USE_SCREEN" = yes ] ; then
-        [ -n "$STY" ] && screen_opts=("-X" "screen")
+        if [ -n "$STY" ] ; then
+            screen_opts=("-X" "screen")
+        else
+            reopen_tty
+        fi
         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
+        reopen_tty
     fi
 
     # start mutt, open original folder and jump to the original message
@@ -201,16 +235,6 @@ else
     fi
 
     screen_window_name=$(MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE "$orig_maildir")
-    screen_opts=()
-    if [ -n "$MUTTJUMP_SCREEN_SESSION" ] ; then
-        screen_opts=("-S" "$MUTTJUMP_SCREEN_SESSION")
-        screen_opts_str="-S $(quote "$MUTTJUMP_SCREEN_SESSION")"
-    fi
-
-    $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_str -t $(quote "$screen_window_name") $MUTT -f $(quote "$orig_maildir")"
-    fi
+    $SCREEN -p "$screen_window_name" -X eval "select '$screen_window_name'" "stuff \"$jump_cmd\""
 fi