Handle path to msmtp

2 files changed, 6 insertions, 6 deletions

diff --git a/.mutt/accounts.rc b/.mutt/accounts.rc
index 22ea16c..45adbd6 100644
--- a/.mutt/accounts.rc
+++ b/.mutt/accounts.rc
@@ -31,7 +31,7 @@ set use_envelope_from = 'yes';\
 my_hdr From: ryanakca@kubuntu.org;\
 my_hdr Reply-To: ryanakca@kubuntu.org;\
 my_hdr Return-Path: ryanakca@kubuntu.org;\
-set sendmail='/usr/bin/msmtp';\
+set sendmail='MSMTP_PATH';\
 unset smtp_url;\
 unset smtp_pass;\
 unset record;\
@@ -46,7 +46,7 @@ set use_envelope_from = 'yes';\
 my_hdr From: ryanakca@kubuntu.org;\
 my_hdr Reply-To: ryanakca@kubuntu.org;\
 my_hdr Return-Path: ryanakca@kubuntu.org;\
-set sendmail='/usr/bin/msmtp';\
+set sendmail='MSMTP_PATH';\
 unset smtp_url;\
 unset smtp_pass;\
 unset record;\
@@ -90,8 +90,8 @@ macro index <F12> "cimaps://imap.gmail.com/INBOX<enter>"
 macro index <F11> "cimap://localhost/INBOX<enter>"
 macro index <F10> "cimaps://mail.queensu.ca/Inbox<enter>"
 
-macro compose <F2> '<enter-command>set sendmail="/usr/bin/msmtp -a ubuntu"<enter><enter-command>unset smtp_url<enter><enter-command>unset smtp_pass<enter><edit-from>Ryan Kavanagh <ryanakca@ubuntu.com><enter><edit-reply-to>ryanakca@ubuntu.com<enter><edit-fcc><enter><enter-command>set postponed="=[Google Mail]/Drafts"<enter>' "Sent mail from Ubuntu account"
-macro compose <F3> '<enter-command>set sendmail="/usr/bin/msmtp"<enter><enter-command>unset smtp_url<enter><enter-command>unset smtp_pass<enter><edit-from>Ryan Kavanagh <ryanakca@kubuntu.org><enter><edit-reply-to>ryanakca@kubuntu.org<enter><edit-fcc><enter><enter-command>set postponed="=[Google Mail]/Drafts"<enter>' "Sent mail from Kubuntu account"
+macro compose <F2> '<enter-command>set sendmail="MSMTP_PATH -a ubuntu"<enter><enter-command>unset smtp_url<enter><enter-command>unset smtp_pass<enter><edit-from>Ryan Kavanagh <ryanakca@ubuntu.com><enter><edit-reply-to>ryanakca@ubuntu.com<enter><edit-fcc><enter><enter-command>set postponed="=[Google Mail]/Drafts"<enter>' "Sent mail from Ubuntu account"
+macro compose <F3> '<enter-command>set sendmail="MSMTP_PATH"<enter><enter-command>unset smtp_url<enter><enter-command>unset smtp_pass<enter><edit-from>Ryan Kavanagh <ryanakca@kubuntu.org><enter><edit-reply-to>ryanakca@kubuntu.org<enter><edit-fcc><enter><enter-command>set postponed="=[Google Mail]/Drafts"<enter>' "Sent mail from Kubuntu account"
 macro compose <F4> '<enter-command>unset sendmail<enter><edit-from>Ryan Kavanagh <ryan.kavanagh@queensu.ca><enter><edit-reply-to>ryan.kavanagh@queensu.ca<enter><edit-fcc>=QueensU.Sent<enter><enter-command>set postponed="=QueensU.Drafts"<enter><enter-command>set smtp_url="smtps://9rak@mail.queensu.ca:465/"<enter><enter-command>set smtp_pass="QUEENSU_PASS"<enter><enter-command>set record="=QueensU.Sent"<enter>' "Sent mail from Queen's account"
 
 set certificate_file = '~/.mutt/certs/certificates'
diff --git a/.muttrc b/.muttrc
index ec744b5..2fc7c7a 100644
--- a/.muttrc
+++ b/.muttrc
@@ -139,7 +139,7 @@ macro index <F9> \
   "<enter-command>unset wait_key<enter><pipe-message>~/bin/mutt-notmuch thread<enter><change-folder-readonly>~/.cache/mutt_results<enter><enter-command>set wait_key<enter>" \
   "search and reconstruct owning thread (using notmuch)"
 
-macro index \e,k "<enter-command> set sendmail='/usr/bin/msmtp'<enter>\
+macro index \e,k "<enter-command> set sendmail='MSMTP_PATH'<enter>\
     <enter-command>set from = 'Ryan Kavanagh <ryanakca@kubuntu.org>'<enter>\
     <enter-command>set envelope_from_address = 'Ryan Kavanagh <ryanakca@kubuntu.org>'<enter>\
     <enter-command>set use_from = yes<enter>\
@@ -147,4 +147,4 @@ macro index \e,k "<enter-command> set sendmail='/usr/bin/msmtp'<enter>\
     <enter-command>my_hdr From: ryanakca@kubuntu.org<enter>\
     <enter-command>my_hdr Reply-To: ryanakca@kubuntu.org<enter>\
     <enter-command>my_hdr Return-Path: ryanakca@kubuntu.org<enter>"
-macro index \e,u "<enter-command> set sendmail='/usr/bin/msmtp -a ubuntu'<enter><enter-command>set from = 'Ryan Kavanagh <ryanakca@ubuntu.com>'<enter><enter-command>set envelope_from_address = 'Ryan Kavanagh <ryanakca@ubuntu.com>'<enter><enter-command>set use_from = yes<enter><enter-command>set use_envelope_from = 'yes'<enter><enter-command>my_hdr From: ryanakca@ubuntu.com<enter><enter-command>my_hdr Reply-To: ryanakca@ubuntu.com<enter><enter-command>my_hdr Return-Path: ryanakca@ubuntu.com<enter>"
+macro index \e,u "<enter-command> set sendmail='MSMTP_PATH -a ubuntu'<enter><enter-command>set from = 'Ryan Kavanagh <ryanakca@ubuntu.com>'<enter><enter-command>set envelope_from_address = 'Ryan Kavanagh <ryanakca@ubuntu.com>'<enter><enter-command>set use_from = yes<enter><enter-command>set use_envelope_from = 'yes'<enter><enter-command>my_hdr From: ryanakca@ubuntu.com<enter><enter-command>my_hdr Reply-To: ryanakca@ubuntu.com<enter><enter-command>my_hdr Return-Path: ryanakca@ubuntu.com<enter>"