From f6b5806af9489d4663b849b4360e314b0709d856 Mon Sep 17 00:00:00 2001 From: "shane.xb.qian" Date: Wed, 16 Nov 2022 11:14:25 +0800 Subject: [PATCH] fix: make o and O macro work and really sync multiple/individual accounts Signed-off-by: shane.xb.qian --- bin/mailsync | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/bin/mailsync b/bin/mailsync index 1855ded..26e71ea 100755 --- a/bin/mailsync +++ b/bin/mailsync @@ -77,16 +77,27 @@ if [ "$#" -gt "0" ]; then done accounts=$* fi -# TODO handle account passed from argument -[ -z "$accounts" ] && accounts="$(awk '/^Channel/ {print $2}' "$MBSYNCRC" 2>/dev/null)" -[ -z "$pop_accounts" ] && [ -x $MPOPRC ] && pop_accounts="$(awk '/^account/ {print $2}' "$MPOPRC" 2>/dev/null)" +[ -z "$imap_accounts" ] && [ -r "$MBSYNCRC" ] && imap_accounts="$(awk '/^Channel/ {print $2}' "$MBSYNCRC" 2>/dev/null)" +[ -z "$pop_accounts" ] && [ -r "$MPOPRC" ] && pop_accounts="$(awk '/^account/ {print $2}' "$MPOPRC" 2>/dev/null)" # Parallelize multiple accounts -for account in $accounts; do +for account in $imap_accounts; do + if [ -n "$accounts" ]; then + for tmp_ac in $accounts; do + [ "$tmp_ac" = "$account" ] && syncandnotify "imap" & + done + continue + fi syncandnotify "imap" & done for account in $pop_accounts; do + if [ -n "$accounts" ]; then + for tmp_ac in $accounts; do + [ "$tmp_ac" = "$account" ] && syncandnotify "pop" & + done + continue + fi syncandnotify "pop" & done