rp

commit de375b9b5537b7ea777c1396a76ceb058c3192ac
parent 7425f5ff1d01a780fdd961a571051d4c1239fb89
Author: parazyd <parazyd@dyne.org>
Date:   Mon,  5 Mar 2018 11:29:41 +0100

Fix pgpewrap mutt paths.

Diffstat:
M
bin/rpsend
 | 
2
--
M
mutt/gpg
 | 
4
++--

2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/bin/rpsend b/bin/rpsend
@@ -82,12 +82,10 @@ EOF
 _subj="$(printf "$email" | rpheaders Subject)"
 _dest="$(printf "$email" | rpheaders To)"
 
-echo
 echo " * subject: $_subj"
 echo " * to:      $_dest"
 echo " * sending $(rputil -e humansize $(printf "$email\n" | wc -c)) over the network"
 
-
 printf "$email\n" | \
 	msmtp $dryrun -C "$msmtpcfg" -t -X "$profile/tmp/msmtp.log"
 
diff --git a/mutt/gpg b/mutt/gpg
@@ -49,11 +49,11 @@ set pgp_clearsign_command="gpg --no-verbose --batch --quiet --output - %?p?--pas
 
 # create a pgp/mime encrypted attachment
 # set pgp_encrypt_only_command="pgpewrap gpg-2comp -v --batch --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
-set pgp_encrypt_only_command="pgpewrap gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
+set pgp_encrypt_only_command="/usr/libexec/neomutt/pgpewrap gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
 
 # create a pgp/mime encrypted and signed attachment
 # set pgp_encrypt_sign_command="pgpewrap gpg-2comp %?p?--passphrase-fd 0? -v --batch --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
-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 -- %f"
+set pgp_encrypt_sign_command="/usr/libexec/neomutt/pgpewrap gpg %?p?--passphrase-fd 0? --batch --quiet --no-verbose --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
 
 # import a key into the public key ring
 set pgp_import_command="gpg --no-verbose --import %f"