diff options
| author | Ryan Kavanagh <rak@debian.org> | 2012-10-01 10:53:41 +0100 |
|---|---|---|
| committer | Ryan Kavanagh <rak@debian.org> | 2012-10-01 10:53:41 +0100 |
| commit | d8f3edd476b470d9416f91ee08ad1b5e05988c3f (patch) | |
| tree | f2827bb00239b4b05ac3e8d6cf775da762022845 | |
| parent | Substitute in gpg binary name in mutt config (diff) | |
Also substitute in path to pgpewrap for mutt
| -rw-r--r-- | .mutt/gpg.rc | 4 | ||||
| -rwxr-xr-x | Makefile | 2 | ||||
| -rw-r--r-- | SUBSTS | 5 |
3 files changed, 8 insertions, 3 deletions
diff --git a/.mutt/gpg.rc b/.mutt/gpg.rc index e6f728e..54254a0 100644 --- a/.mutt/gpg.rc +++ b/.mutt/gpg.rc @@ -3,8 +3,8 @@ set pgp_verify_command="GPG_BINARY --status-fd=2 --no-verbose --quiet --batch -- set pgp_decrypt_command="GPG_BINARY --status-fd=2 %?p?--passphrase-fd 0? --no-verbose --quiet --batch --output - %f" set pgp_sign_command="GPG_BINARY --no-verbose --batch --quiet --output - %?p?--passphrase-fd 0? --armor --detach-sign --textmode %?a?-u %a? %f" set pgp_clearsign_command="GPG_BINARY --no-verbose --batch --quiet --output - %?p?--passphrase-fd 0? --armor --textmode --clearsign %?a?-u %a? %f" -set pgp_encrypt_only_command="/usr/lib/mutt/pgpewrap GPG_BINARY --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f" -set pgp_encrypt_sign_command="/usr/lib/mutt/pgpewrap GPG_BINARY %?p?--passphrase-fd 0? --batch --quiet --no-verbose --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f" +set pgp_encrypt_only_command="PGPEWRAP_BINARY GPG_BINARY --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f" +set pgp_encrypt_sign_command="PGPEWRAP_BINARY GPG_BINARY %?p?--passphrase-fd 0? --batch --quiet --no-verbose --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f" set pgp_import_command="GPG_BINARY --no-verbose --import %f" set pgp_export_command="GPG_BINARY --no-verbose --export --armor %r" set pgp_verify_key_command="GPG_BINARY --verbose --batch --fingerprint --check-sigs %r" @@ -85,7 +85,7 @@ VARS_.gitconfig = MSMTP_PATH VARS_.imapfilter/config.lua = LOCAL_PASS PM_EMAIL IMAPFILTER_GMAIL_SERVER GMAIL_PASS VARS_.msmtprc = GMAIL_PASS QUEENSU_PASS LOCALHOST MCGSOCS_PASS MCGILL_PASS SSL_CERTS VARS_.mutt/accounts.rc = LOCAL_PASS GMAIL_PASS QUEENSU_PASS MSMTP_PATH MCGILL_PASS -VARS_.mutt/gpg.rc = GPG_BINARY +VARS_.mutt/gpg.rc = GPG_BINARY PGPEWRAP_BINARY VARS_.mutt/score.rc = MUTT_10_SCORE MUTT_20_SCORE VARS_.muttrc = MSMTP_PATH VARS_.netrc = LOCAL_PASS GMAIL_PASS @@ -72,3 +72,8 @@ IMAPFILTER_GMAIL_SERVER REMOTE_GMAIL # gpg or gpg2 GPG_BINARY gpg2 + +# pgpewrap +# /usr/local/bin/pgpewrap on OpenBSD +# /usr/lib/mutt/pgpewrap on Debian +PGPEWRAP_BINARY /usr/lib/mutt/pgpewrap |