Merge branch 'master' into screen-git

[muttjump] / muttjump

diff --git a/muttjump b/muttjump
index 60da9408d1c5d49d1923251cb16d78f1dd2d287e..ab438007b46c3967ab6a9cff4a2f84d714e6bb4f 100755 (executable)
--- a/muttjump
+++ b/muttjump
@@ -170,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 ;
 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-)
     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
 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
     # get containing maildir of $orig_msgfile
     orig_maildir=$(dirname "$(dirname "$orig_msgfile")")
 fi