From: Johannes Weißl Date: Sun, 5 Dec 2010 02:02:10 +0000 (+0100) Subject: Merge branch 'master' into screen-git X-Git-Url: https://projects.mako.cc/source/muttjump/commitdiff_plain/0e98096c81a4ec21be101a33dd5b7ff1d47204d4?hp=a2cab25a1101edc120297360f5a2d3b173018fb4 Merge branch 'master' into screen-git --- diff --git a/muttjump b/muttjump index 60da940..ab43800 100755 --- 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 ; - 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