From 9897728497accb8449090f6c030303deba22aa96 Mon Sep 17 00:00:00 2001
From: lara <lara@pixie>
Date: Thu, 18 Jun 2020 21:41:17 -0400
Subject: [PATCH] [mail] Add password unlock step to mailsync

---
 bin/mailsync | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/bin/mailsync b/bin/mailsync
index 69f9b96..256ebf7 100755
--- a/bin/mailsync
+++ b/bin/mailsync
@@ -1,5 +1,10 @@
 #!/bin/sh
 
+die () {
+    2>&1 echo "$*"
+    exit 1
+}
+
 maildir=~/mail
 mailboxes=$(find "$maildir" -mindepth 1 -maxdepth 1 -type d ! -name cur ! -name tmp ! -name new ! -name .notmuch -printf '%f\n')
 
@@ -16,7 +21,10 @@ fi
 trap "rm -f $LOCKFILE; exit" INT TERM EXIT
 echo $$ > "$LOCKFILE"
 
-for m in $mailboxes; do
+# Try a single short sync to test password availability
+mbsync "$(echo "$mailboxes" | head -n 1)" || die "Please unlock password database"
+
+for m in $(echo "$mailboxes" | tail -n+2); do
     mbsync "$m" &
     sleep 1
 done