modified Makefile, modified bin/mw

1 files changed, 10 insertions, 1 deletions

diff --git a/bin/mw b/bin/mw
index 6012c21..21b7bfe 100755
--- a/bin/mw
+++ b/bin/mw
@@ -219,7 +219,16 @@ getboxes() {
   else
     info="$(curl --location-trusted -s -m 5 --user "$login:$(pass "$passprefix$fulladdr")" --url "${protocol:-imaps}://$imap:${iport:-993}")"
     [ -z "$info" ] && errorexit
-    mailboxes="$(echo "$info" | grep -v HasChildren | sed "s/.*\" //;s/\"//g" | tr -d '\r')"
+    unsorted_mailboxes="$(echo "$info" | grep -v HasChildren | sed "s/.*\" //;s/\"//g" | tr -d '\r')"
+    desired_order="Archive INBOX Drafts Sent Junk Trash"
+    mailboxes=""
+    for desired in $desired_order; do
+      if echo "$unsorted_mailboxes" | grep -qx "$desired"; then
+        mailboxes="${mailboxes}${desired}
+"
+      fi
+    done
+    mailboxes="$(printf "%s" "$mailboxes" | sed '/^$/d')"
   fi
   [ "$type" = "pop" ] && mailboxes="INBOX"
   for x in $(