commit 8d2823f10f7caf07b8e7545e52d06ae10ffe6b42 parent d307b30f81a161403424f28dbf039dbef767adf7 Author: Jaromil <jaromil@dyne.org> Date: Fri, 26 Dec 2014 18:55:15 +0100 modified to encrypt mails always also with the default key configured in gpg.conf Diffstat:
M | src/zlibs/filters | | | 39 | ++++++++++++++++++++++++++++----------- |
1 file changed, 28 insertions(+), 11 deletions(-)
diff --git a/src/zlibs/filters b/src/zlibs/filters @@ -331,11 +331,21 @@ update_mutt() { func "binary: $mutt" func "pgpewrap: $pgpewrap" func "lock: $dotlock" - ${=mkdir} $MUTTDIR - ${=mkdir} $MUTTDIR/cache - rm -f $MUTTDIR/rc - cat<<EOF > $MUTTDIR/rc -# mutt config generated by Jaro Mail + ${=mkdir} "$MUTTDIR" + ${=mkdir} "$MUTTDIR"/cache + rm -f "$MUTTDIR"/rc + + gpgkey="" + # detect the default gpg key to always encrypt also to self + [[ -r $HOME/.gnupg/gpg.conf ]] && { + gpgkey=`awk '/^default-key/ { print $2 }' $HOME/.gnupg/gpg.conf` + act "default GPG key configured: $gpgkey" + } + cat<<EOF > "$MUTTDIR"/rc +#### Mutt config automatically generated by Jaro Mail +### do not edit: this file is overwritten by jaro update +### put your customizations in \$MAILDIRS/Identity.txt + unset use_domain set folder = '$MAILDIRS' set spoolfile = '$MAILDIRS/known/' @@ -369,15 +379,22 @@ source '$TMPDIR/muttpass' EOF -##################### -# helper applications -act "configuring helper applications" -cat <<EOF >> "$MUTTDIR/rc" + [[ "$gpgkey" = "" ]] || { + # gpg special settings + + cat <<EOF >> "$MUTTDIR"/rc +## GnuPG specific settings +# create a pgp/mime encrypted attachment +set pgp_encrypt_only_command="pgpewrap gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust -- -r %r $gpgkey -- '%f'" + +# create a pgp/mime encrypted and signed attachment +set pgp_encrypt_sign_command="pgpewrap gpg %?p?--passphrase-fd 0? --batch --quiet --no-verbose --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r $gpgkey -- '%f'" + ## end of Jaro Mail generated muttrc #################################### - EOF - + } + # MUTT MAILCAP cat <<EOF > $MUTTDIR/mailcap text/plain; iconv -f iso-8859-1 -t utf-8; test=charset=%{charset} \