y0rune/mutt-wizard
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added pgp (gpg) support by default (#447)

Browse Source 
* mutt-wizard works on FreeBSD, also changed mbsync with isync (actual package name)

* Added pgp support
This commit is contained in:
qorg11 2020-05-31 12:22:00 +02:00 committed by GitHub
parent e69a7ad311
commit 12e37fce3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -112,5 +112,5 @@ mutt-wizard is free/libre software, licensed under the GPLv3.
## To-do ## To-do
- Add ~~Mac OS~~/BSD compatibility (the script is confired to work for Mac OS now) - Add ~~Mac OS~~/~~BSD~~ compatibility (the script is confired to work for Mac OS and FreeBSD now)
- ~~Out-of-the-box compatibility with Protonmail Bridge~~ (I believe this is done, but more bug-testing is welcome since I don't have PM) - ~~Out-of-the-box compatibility with Protonmail Bridge~~ (I believe this is done, but more bug-testing is welcome since I don't have PM)

11
bin/mw
View File

@ -7,7 +7,7 @@ command -V gpg >/dev/null 2>&1 && GPG="gpg" || GPG="gpg2"
printf "\`pass\` must be installed and initialized to encrypt passwords.\\nBe sure it is installed and run \`pass init <yourgpgemail>\`.\\nIf you don't have a GPG public private key pair, run \`%s --full-gen-key\` first.\\n" "$GPG" printf "\`pass\` must be installed and initialized to encrypt passwords.\\nBe sure it is installed and run \`pass init <yourgpgemail>\`.\\nIf you don't have a GPG public private key pair, run \`%s --full-gen-key\` first.\\n" "$GPG"
exit exit
} }
! command -v mbsync >/dev/null && printf "\`mbsync\` 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"
muttdir="$HOME/.config/mutt" # Main mutt config location muttdir="$HOME/.config/mutt" # Main mutt config location
@ -86,6 +86,9 @@ set folder = \"$maildir/$title\"
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 mbox_type = Maildir set mbox_type = Maildir
set crypt_opportunistic_encrypt = yes
set pgp_self_encrypt = yes
set pgp_default_key = $keyid
bind index,pager gg noop bind index,pager gg noop
bind index,pager g noop bind index,pager g noop
@ -108,6 +111,11 @@ 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 mutt-wizard-$title\`\"
set crypt_opportunistic_encrypt = yes
set pgp_self_encrypt = yes
set pgp_default_key = $keyid
set mbox_type = Maildir set mbox_type = Maildir
set ssl_starttls = yes set ssl_starttls = yes
set ssl_force_tls = yes set ssl_force_tls = yes
@ -126,6 +134,7 @@ fi
askinfo() { \ askinfo() { \
printf "Insert the \033[31memail address\033[0m that you want to autoconfigure for mutt/mbsync\\n\tEmail: \033[36m" printf "Insert the \033[31memail address\033[0m that you want to autoconfigure for mutt/mbsync\\n\tEmail: \033[36m"
read -r fulladdr read -r fulladdr
keyid=$( gpg --list-keys --with-colons $fulladdr | awk -F: '/^pub:/ { print $5 }')
printf "\033[0m" printf "\033[0m"
while ! echo "$fulladdr" | grep "$emailre" >/dev/null; do while ! echo "$fulladdr" | grep "$emailre" >/dev/null; do
printf "That is not a valid \033[31memail address\033[0m, please retype the desired email.\\n\\nEmail: \033[36m\t" printf "That is not a valid \033[31memail address\033[0m, please retype the desired email.\\n\\nEmail: \033[36m\t"