X-Git-Url: https://projects.mako.cc/source/muttjump/blobdiff_plain/461a262aea47dd6bcc6f590247857cabb5bf407c..66d1f1c0157e1c5fe04831176b6f9d47077c8091:/muttjump

diff --git a/muttjump b/muttjump
index 28fb3a7..5c7e15f 100755
--- a/muttjump
+++ b/muttjump
@@ -170,25 +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
-    dirs=()
-    for f in $orig_msgfiles ; do
-        dirs=(${dirs[@]} "$(dirname "$(dirname "$f")")")
-    done
+    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 ${dirs[@]} ; do
-        orig_maildir="$md"
-        orig_msgfile="${orig_msgfiles[$REPLY]}"
+    select md in "${choices[@]}" ; do
+        orig_maildir=$md
         break
     done <> /dev/tty
 else
-    orig_msgfile="$orig_msgfiles"
+    orig_msgfile=$orig_msgfiles
     # get containing maildir of $orig_msgfile
     orig_maildir=$(dirname "$(dirname "$orig_msgfile")")
 fi