curl redirects and times out

2 files changed, 2 insertions, 6 deletions

diff --git a/bin/mailsync b/bin/mailsync
index 1d676b8..3fac7c5 100755
--- a/bin/mailsync
+++ b/bin/mailsync
@@ -81,16 +81,12 @@ else
     accounts=$*
 fi
 
-#( kill -46 "$(pidof "${STATUSBAR:-dwmblocks}")" >/dev/null 2>&1 ) 2>/dev/null
-
 # Parallelize multiple accounts
-for account in $accounts
-do
+for account in $accounts; do
     syncandnotify &
 done
 
 wait
-#( kill -46 "$(pidof "${STATUSBAR:-dwmblocks}")" >/dev/null 2>&1 ) 2>/dev/null
 
 notmuch new 2>/dev/null
 
diff --git a/bin/mw b/bin/mw
index 0c00e53..19befb3 100755
--- a/bin/mw
+++ b/bin/mw
@@ -234,7 +234,7 @@ Junk
 Trash
 Sent
 Archive" && return 0
-	info="$(curl -s --user "$login:$(pass $pass_prefix$fulladdr)" --url "${protocol:-imaps}://$imap")"
+	info="$(curl --location-trusted -s -m 5 --user "$login:$(pass $pass_prefix$fulladdr)" --url "${protocol:-imaps}://$imap")"
 	[ -z "$info" ] && echo "Log-on not successful." && return 1
 	mailboxes="$(echo "$info" | sed "s/.*\" //" | tr -d '
')"
 }