allow program paths to contain arguments

[muttjump] / muttjump

diff --git a/muttjump b/muttjump
index 32644d3b21f5e66e2a8f95a11f112277379e0cd4..8170f4e821857f7d3f6c21c6d4af2af03421d84d 100755 (executable)
--- a/muttjump
+++ b/muttjump
@@ -58,6 +58,11 @@ function quote () {
     echo \'${1//\'/\'\\\'\'}\'
 }
 
+function is_callable () {
+    read cmd args <<<$1
+    type -p $cmd >/dev/null
+}
+
 # Check command-line arguments and STDIN
 if tty -s || [ $# -ne 0 ] ; then
     cat >&2 <<END
@@ -71,7 +76,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,12 +89,12 @@ 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: \(.*\)/\1/Ip' | head -n1)
+    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"
@@ -133,22 +138,32 @@ 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>"
+jump_expr="~i'$msgid'"
 
 if [ "$MUTTJUMP_USE_SCREEN" = no ] ; then
 
+    jump_cmd="<limit>$jump_expr<enter>"
+    if [ "$MUTTJUMP_MODE" = search ] ; then
+        jump_cmd="$jump_cmd<limit>all<enter>"
+    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}')"
+    term="/dev/$(ps -p$$ -otty=)"
     exec < $term
 
     # start mutt, open original folder and jump to the original message
-    $MUTT -e "push \"<change-folder>$orig_maildir<enter>$jump_cmd\""
+    $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")
     declare -a screen_opts
     if [ -n "$MUTTJUMP_SCREEN_SESSION" ] ; then
@@ -156,8 +171,8 @@ else
         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"
+    $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")"