| @@ -10,6 +10,7 @@ command -V gpg >/dev/null 2>&1 && GPG="gpg" || GPG="gpg2" | |||||
| ! command -v mbsync >/dev/null && printf "\`mbsync (isync package)\` must be installed to run mutt-wizard.\\n" && exit | ! command -v mbsync >/dev/null && printf "\`mbsync (isync package)\` must be installed to run mutt-wizard.\\n" && exit | ||||
| prefix="/usr/local" | prefix="/usr/local" | ||||
| pass_prefix="mutt-wizard-" | |||||
| muttdir="${XDG_CONFIG_HOME:-$HOME/.config}/mutt" # Main mutt config location | muttdir="${XDG_CONFIG_HOME:-$HOME/.config}/mutt" # Main mutt config location | ||||
| accdir="$muttdir/accounts" # Directory for account settings | accdir="$muttdir/accounts" # Directory for account settings | ||||
| maildir="${XDG_DATA_HOME:-$HOME/.local/share}/mail" # Location of mail storage | maildir="${XDG_DATA_HOME:-$HOME/.local/share}/mail" # Location of mail storage | ||||
| @@ -47,14 +48,14 @@ host $smtp | |||||
| port $sport | port $sport | ||||
| from $fulladdr | from $fulladdr | ||||
| user $login | user $login | ||||
| passwordeval \"pass mutt-wizard-$title\" | |||||
| passwordeval \"pass $pass_prefix$title\" | |||||
| $starttlsoff | $starttlsoff | ||||
| " | " | ||||
| mbsync_profile="IMAPStore $title-remote | mbsync_profile="IMAPStore $title-remote | ||||
| Host $imap | Host $imap | ||||
| Port $iport | Port $iport | ||||
| User $login | User $login | ||||
| PassCmd \"pass mutt-wizard-$title\" | |||||
| PassCmd \"pass $pass_prefix$title\" | |||||
| AuthMechs LOGIN | AuthMechs LOGIN | ||||
| SSLType $ssltype | SSLType $ssltype | ||||
| CertificateFile $sslcert | CertificateFile $sslcert | ||||
| @@ -108,7 +109,7 @@ set folder = \"imaps://$login@$imap:$iport\" | |||||
| set imap_user = \"$login\" | set imap_user = \"$login\" | ||||
| set header_cache = $cachedir/$title/headers | set header_cache = $cachedir/$title/headers | ||||
| set message_cachedir = $cachedir/$title/bodies | set message_cachedir = $cachedir/$title/bodies | ||||
| set imap_pass = \"\`pass mutt-wizard-$title\`\" | |||||
| set imap_pass = \"\`pass $pass_prefix$title\`\" | |||||
| set mbox_type = Maildir | set mbox_type = Maildir | ||||
| set ssl_starttls = yes | set ssl_starttls = yes | ||||
| @@ -218,8 +219,8 @@ protonfinger() { printf "Getting Protonmail bridge fingerprint...\\n" | |||||
| sed -ibu "s/account $title/&\ntls_trust_file\ntls_fingerprint $fingerprint/" "$msmtprc" ; rm -f "$msmtprc"bu | sed -ibu "s/account $title/&\ntls_trust_file\ntls_fingerprint $fingerprint/" "$msmtprc" ; rm -f "$msmtprc"bu | ||||
| } | } | ||||
| getpass() { while : ; do pass rm -f "mutt-wizard-$title" >/dev/null 2>&1 | |||||
| pass insert "mutt-wizard-$title" && break; done ;} | |||||
| getpass() { while : ; do pass rm -f "$pass_prefix$title" >/dev/null 2>&1 | |||||
| pass insert "$pass_prefix$title" && break; done ;} | |||||
| formatShortcut() { \ | formatShortcut() { \ | ||||
| while read -r data; do { echo "macro index,pager g$1 \"<change-folder>$data<enter>\" \"go to $2\" # mw-autogenerated" | while read -r data; do { echo "macro index,pager g$1 \"<change-folder>$data<enter>\" \"go to $2\" # mw-autogenerated" | ||||