don't use echo -e

[muttjump] / muttjump

diff --git a/muttjump b/muttjump
index b5736d568d8a90defc0c6e24c2f01a0bd9a3f8bb..5c7e15f122b25599540caba5f302796ec7becc44 100755 (executable)
--- a/muttjump
+++ b/muttjump
@@ -80,6 +80,15 @@ 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"
@@ -161,13 +170,24 @@ fi
 count=$(echo "$orig_msgfiles" | wc -l)
 if [ $count -gt 1 -a -n "$DIALOG_PROG" ] ; then
     choices=$(echo "$orig_msgfiles" | while read line ;
-        do echo -e "$(dirname "$(dirname "$line")")\n." ; done)
+        do dirname "$(dirname "$line")" ; echo . ; done)
     maxwidth=$(echo "$choices" | wc -L)
     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
+    choices=()
+    while read line ; do
+        choices=("${choices[@]}" "$(dirname "$(dirname "$line")")")
+    done <<<"$orig_msgfiles"
+    echo "More than one mailbox found"
+    echo "Select mailbox:"
+    select md in "${choices[@]}" ; do
+        orig_maildir=$md
+        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
@@ -191,17 +211,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