Skip to content

Commit

Permalink
-X to delete local mail when deleting account
Browse files Browse the repository at this point in the history
  • Loading branch information
LukeSmithxyz committed Feb 5, 2021
1 parent ddbf60a commit 1e7a2fa
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
7 changes: 5 additions & 2 deletions bin/mw
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ delete() { if [ -z "${fulladdr+x}" ]; then
sed -ibu "/[0-9]-$fulladdr.muttrc/d" "$muttrc" ; rm -f "$muttrc"bu
sed -ibu "/account $fulladdr/,/^\(\s*$\|account\)/d" "$msmtprc"; rm -f "$msmtprc"bu
pass rm -f "$fulladdr" >/dev/null 2>&1
[ -n "${purge+x}" ] && rm -rf "${maildir:?}/${fulladdr:?}"

# Get rid of those multiple newlines because I don't know awk well enough to do it by default lol.
for file in "$msmtprc" "$mbsyncrc"; do
Expand Down Expand Up @@ -305,7 +306,8 @@ Options allowed with -a:
-S SMTP server port
-x Password for account (recommended to be in double quotes)
-p Install for a Protonmail account.
-P Add for a POP server instead of IMAP
-P Add for a POP server instead of IMAP.
-X Delete an account's local email too when deleting.
-o Configure address, but keep mail online.
-f Assume typical English mailboxes without attempting log-on.
Expand All @@ -316,7 +318,7 @@ To change an account's password, run \`pass edit [email protected]\`.
EOF
}

while getopts "fpPlhodTYD:y:i:I:s:S:u:a:n:x:m:t:" o; do case "${o}" in
while getopts "fpPXlhodTYD:y:i:I:s:S:u:a:n:x:m:t:" o; do case "${o}" in
l) setact list || exit 1 ;;
d) setact delete || exit 1 ;;
D) setact delete || exit 1 ; fulladdr="$OPTARG" ;;
Expand All @@ -334,6 +336,7 @@ while getopts "fpPlhodTYD:y:i:I:s:S:u:a:n:x:m:t:" o; do case "${o}" in
P) setact add || exit 1 ; type="pop" ;;
f) setact add || exit 1 ; force=True ;;
x) setact add || exit 1 ; password="$OPTARG" ;;
X) setact delete || exit 1 ; purge=True ;;
t) setact toggle || exit 1 ; cronmin="$OPTARG" ;;
T) setact toggle || exit 1 ;;
p) echo "NOTE: Protonmail users must install and configure Protonmail Bridge first for the first sync to work."
Expand Down
7 changes: 7 additions & 0 deletions mw.1
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,13 @@ connection will still be attempted in setup to discover mailboxes.
.TP
.B -p
Add a Protonmail account. Protonmail Bridge must be installed and set up.
.TP
.B -X
When removing an email profile with either
.I -d
or
.I -D,
also delete the local mail (will not delete the mail on the server).
.SH DETAILS
.TP
.B mailsync
Expand Down

0 comments on commit 1e7a2fa

Please sign in to comment.