correct paths in sample config

Closes #1271

diff --git a/contrib/gpg.rc b/contrib/gpg.rc
index f65a31bb064c9de93a86b7ae4c55db0227f9e18d..f9947e929749f24d3f330b6c9cce4433aee6dd3a 100644 (file)
--- a/contrib/gpg.rc
+++ b/contrib/gpg.rc
@@ -83,15 +83,15 @@ set pgp_clearsign_command="gpg %?p?--pinentry-mode loopback --passphrase-fd 0? -
 
 # Create an encrypted attachment (note that some users include the --always-trust option here)
 #
-# set pgp_encrypt_only_command="/usr/lib/neomutt/pgpewrap gpg-2comp -v --batch --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
+# set pgp_encrypt_only_command="/usr/libexec/neomutt/pgpewrap gpg-2comp -v --batch --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
 #
-set pgp_encrypt_only_command="/usr/lib/neomutt/pgpewrap gpg --batch --quiet --no-verbose --output - --textmode --armor --encrypt -- --recipient %r -- %f"
+set pgp_encrypt_only_command="/usr/libexec/neomutt/pgpewrap gpg --batch --quiet --no-verbose --output - --textmode --armor --encrypt -- --recipient %r -- %f"
 
 # Create an encrypted and signed attachment (note that some users include the --always-trust option here)
 #
-# set pgp_encrypt_sign_command="/usr/lib/neomutt/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="/usr/libexec/neomutt/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="/usr/lib/neomutt/pgpewrap gpg %?p?--pinentry-mode loopback --passphrase-fd 0? --batch --quiet --no-verbose --textmode --output - %?a?--local-user %a? --armor --sign --encrypt -- --recipient %r -- %f"
+set pgp_encrypt_sign_command="/usr/libexec/neomutt/pgpewrap gpg %?p?--pinentry-mode loopback --passphrase-fd 0? --batch --quiet --no-verbose --textmode --output - %?a?--local-user %a? --armor --sign --encrypt -- --recipient %r -- %f"
 
 # Import a key into the public key ring
 #

diff --git a/contrib/sample.neomuttrc b/contrib/sample.neomuttrc
index 894305ea0847d9b44e31bec28eef3b1645016295..a2579e92fa1952d329293e4f687c00ab505bd5f0 100644 (file)
--- a/contrib/sample.neomuttrc
+++ b/contrib/sample.neomuttrc
@@ -79,7 +79,7 @@ set reverse_name              # use my address as it appears in the message
                                # i am replying to
 set nosave_empty               # remove files when no messages are left
 #set save_name                 # save outgoing messages by recipient, if the
-#set sendmail="/usr/lib/sendmail -oi -oem"     # how to deliver mail
+#set sendmail="/usr/sbin/sendmail -oi -oem"    # how to deliver mail
 #set shell="/bin/zsh"          # program to use for shell escapes
 #set signature="~/.signature"  # file which contains my signature
 

diff --git a/contrib/smime.rc b/contrib/smime.rc
index 9a6e76a9e807ba4dcd7d76e53fa83dac6352e780..0450a0497923a6f4237d38849baac52dcab7c430 100644 (file)
--- a/contrib/smime.rc
+++ b/contrib/smime.rc
@@ -69,7 +69,7 @@ set smime_get_signer_cert_command="openssl smime -verify -in %f -noverify -signe
 set smime_get_cert_email_command="openssl x509 -in %f -noout -email"
 
 # Add a certificate to the database using smime_keys.
-set smime_import_cert_command="/usr/lib/neomutt/smime_keys add_cert %f"
+set smime_import_cert_command="/usr/libexec/neomutt/smime_keys add_cert %f"