X-Git-Url: https://projects.mako.cc/source/muttjump/blobdiff_plain/898fab5994b1bf77eff72962aada243b7abc647c..537aa1680c66b3843b7fabefb98330b408c2d666:/muttjump

diff --git a/muttjump b/muttjump
index d32a8ae..351e3ac 100755
--- a/muttjump
+++ b/muttjump
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
 # written by Johannes Weißl
 
 # muttjump
@@ -128,15 +128,17 @@ 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 $(quote $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_USE_SCREEN" = no ] ; then
 
+    jump_cmd="<$MUTTJUMP_MODE>$jump_expr<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?)
@@ -145,10 +147,19 @@ if [ "$MUTTJUMP_USE_SCREEN" = no ] ; then
     exec < $term
 
     # start mutt, open original folder and jump to the original message
-    $MUTT -e "push \"$jump_cmd\""
+    $MUTT -f "$orig_maildir" -e "push \"$jump_cmd\""
 
 else
 
+    case $MUTTJUMP_MODE in
+        limit)
+            jump_cmd="l$jump_expr"
+            ;;
+        search)
+            jump_cmd="/$jump_expr"
+            ;;
+    esac
+
     screen_window_name=$(MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE "$orig_maildir")
     declare -a screen_opts
     if [ -n "$MUTTJUMP_SCREEN_SESSION" ] ; then
@@ -156,8 +167,8 @@ else
         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_str -t $(quote "$screen_window_name") $MUTT -f $(quote "$orig_maildir")"