summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to 'bin')
-rwxr-xr-xbin/mailsync9
-rwxr-xr-xbin/mw5
2 files changed, 11 insertions, 3 deletions
diff --git a/bin/mailsync b/bin/mailsync
index f00baf1..a633308 100755
--- a/bin/mailsync
+++ b/bin/mailsync
@@ -57,7 +57,14 @@ esac
syncandnotify() {
acc="$(echo "$account" | sed "s/.*\///")"
if [ -z "$opts" ]; then mbsync "$acc"; else mbsync "$opts" "$acc"; fi
- new=$(find "$HOME/.local/share/mail/$acc/INBOX/new/" "$HOME/.local/share/mail/$acc/Inbox/new/" "$HOME/.local/share/mail/$acc/inbox/new/" -type f -newer "${XDG_CONFIG_HOME:-$HOME/.config}/mutt/.mailsynclastrun" 2> /dev/null)
+ new=$(find\
+ "$HOME/.local/share/mail/$acc/INBOX/new/"\
+ "$HOME/.local/share/mail/$acc/Inbox/new/"\
+ "$HOME/.local/share/mail/$acc/inbox/new/"\
+ "$HOME/.local/share/mail/$acc/INBOX/cur/"\
+ "$HOME/.local/share/mail/$acc/Inbox/cur/"\
+ "$HOME/.local/share/mail/$acc/inbox/cur/"\
+ -type f -newer "${XDG_CONFIG_HOME:-$HOME/.config}/mutt/.mailsynclastrun" 2> /dev/null)
newcount=$(echo "$new" | sed '/^\s*$/d' | wc -l)
case 1 in
$((newcount > 5)) ) notify "$acc" "$newcount" ;;
diff --git a/bin/mw b/bin/mw
index 6845f44..e63fff2 100755
--- a/bin/mw
+++ b/bin/mw
@@ -45,9 +45,10 @@ from $fulladdr
user $login
passwordeval \"pass $fulladdr\"
auth ${auth:-on}
-${tlsline:-tls on}
+tls on
tls_trust_file $sslcert
logfile $msmtplog
+$tlsline
" >> "$msmtprc"
}
@@ -120,7 +121,7 @@ $synccmd
}
getprofiles() { \
- mkdir -p "${muttrc%/*}" "$accdir" "$cachedir/$fulladdr/bodies" "${XDG_CONFIG_HOME:-$HOME/.config}/msmtp"
+ mkdir -p "${muttrc%/*}" "$accdir" "${XDG_CONFIG_HOME:-$HOME/.config}/msmtp"
unset msmtp_header msmtp_profile mutt_profile mbsync_profile
case "$iport" in
1143) imapssl=None ;;