replace single screen call with two separate (more portable)

[muttjump] / muttjump

diff --git a/muttjump b/muttjump
index aa9e8b80f458b410a66fb1cd0303be31191202fd..f3771604fdc6b213e6c4007cfce64f4573d1bb2e 100755 (executable)
--- a/muttjump
+++ b/muttjump
@@ -21,17 +21,43 @@
 # one of: mairix, mu, mu-old (mu < 0.7) and nmzmail
 MUTTJUMP_INDEXER=${MUTTJUMP_INDEXER:-}
 
+# "limit" or "search" (default)
+MUTTJUMP_MODE=${MUTTJUMP_MODE:-search}
+
+# "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}
+
+# 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
+    function MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE () {
+        basename "$1"
+    }
+fi
+
 # program paths
 MUTT=${MUTT:-mutt}
 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//\'/\'\\\'\'}\'
+}
+
 # Check command-line arguments and STDIN
 if tty -s || [ $# -ne 0 ] ; then
     cat >&2 <<END
@@ -49,8 +75,22 @@ if ! type -p $MUTT >/dev/null ; 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/p' | head -n1)
+if type -p $FORMAIL >/dev/null ; then
+    msgid=$($FORMAIL -c -z -x Message-ID | head -n1)
+elif type -p $REFORMAIL >/dev/null ; then
+    msgid=$($REFORMAIL -c -x Message-ID: | head -n1)
+else
+    msgid=$(sed -n 's/^Message-ID: \(.*\)/\1/Ip' | head -n1)
+fi
 if [ -z "$msgid" ] ; then
     die "could not find Message-ID header in standard input"
 fi
@@ -87,14 +127,39 @@ if [ -z "$orig_msgfile" -o ! -e "$orig_msgfile" ] ; then
     die "no message with msgid $msgid found!"
 fi
 
+# get containing maildir of $orig_msgfile
 orig_maildir=$(dirname $(dirname "$orig_msgfile"))
+if [ ! -d "$orig_maildir/cur" ] ; then
+    die "directory $(quote "$orig_maildir") doesn't exist or is no Maildir"
+fi
+
+jump_cmd="<$MUTTJUMP_MODE>~i '$msgid'<enter>"
 
-# 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
+if [ "$MUTTJUMP_USE_SCREEN" = no ] ; then
 
-# start mutt, open original folder and jump to the original message
-$MUTT -e "push <change-folder>$orig_maildir<enter><search>\"~i $msgid\"<enter>"
+    # 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
+
+    # start mutt, open original folder and jump to the original message
+    $MUTT -e "push \"<change-folder>$orig_maildir<enter>$jump_cmd\""
+
+else
+
+    screen_window_name=$(MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE "$orig_maildir")
+    declare -a 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 select .
+    $SCREEN "${screen_opts[@]}" -p "$screen_window_name" -X stuff ":push \"$jump_cmd\"\r"
+    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
+fi