Handle path to msmtp

6 files changed, 22 insertions, 9 deletions

diff --git a/.gitconfig b/.gitconfig
index 78ac87f..bee7c0c 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -4,6 +4,6 @@
 [color]
 	ui = auto
 [sendemail]
-	smtpserver = /usr/bin/msmtp
+	smtpserver = MSMTP_PATH
 [alias]
 	wdiff = diff --color-words
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>"
diff --git a/.zshrc b/.zshrc
index a167e6c..e041b9f 100644
--- a/.zshrc
+++ b/.zshrc
@@ -60,7 +60,7 @@ export CCACHE_DIR=/ccache
 #export HTTP_PROXY="http://localhost:3128/"
 export MANWIDTH=80
 export MANOPT="-L en"
-export BTS_SENDMAIL_COMMAND="/usr/bin/msmtp"
+export BTS_SENDMAIL_COMMAND="MSMTP_PATH"
 export PYTHONSTARTUP=~/.pythonrc.py
 
 alias apt-upgrade='sudo apt-get update && sudo aptitude dist-upgrade'
diff --git a/SUBSTS b/SUBSTS
index 26c8666..42c0a65 100644
--- a/SUBSTS
+++ b/SUBSTS
@@ -22,3 +22,6 @@ LOCALE es_ES.UTF-8
 
 # ls or gls command
 SUBSTS_LS ls
+
+# path to msmtp
+MSMTP_PATH /usr/bin/msmtp
diff --git a/dm b/dm
index 448e0ba..fb75286 100755
--- a/dm
+++ b/dm
@@ -72,6 +72,10 @@ build/.offlineimaprc: .offlineimaprc $(SUBSTS_FILE)
 	    -e 's/GMAIL_PASS/$(GMAIL_PASS)/g' \
 	    -e 's/QUEENSU_PASS/$(QUEENSU_PASS)/g' $< > $@
 
+build/.gitconfig: .gitconfig $(SUBSTS_FILE)
+	[ -d $(dir $@) ] || mkdir $(dir $@)
+	sed -e 's/MSMTP_PATH/$(MSMTP_PATH)/g' $< > $@
+
 build/.imapfilter/config.lua: .imapfilter/config.lua $(SUBSTS_FILE)
 	[ -d build/.imapfilter ] || mkdir -p build/.imapfilter
 	sed -e 's/LOCAL_PASS/$(LOCAL_PASS)/g' \
@@ -86,11 +90,16 @@ build/.msmtprc: .msmtprc $(SUBSTS_FILE)
 	sed -e 's/QUEENSU_PASS/$(QUEENSU_PASS)/g' \
 	    -e 's/GMAIL_PASS/$(GMAIL_PASS)/g' $< > $@
 
+build/.muttrc: .muttrc $(SUBSTS_FILE)
+	[ -d $(dir $@) ] || mkdir $(dir $@)
+	sed -e 's/MSMTP_PATH/$(MSMTP_PATH)/g' $< > $@
+
 build/.mutt/accounts.rc: .mutt/accounts.rc $(SUBSTS_FILE)
 	[ -d build/.mutt ] || mkdir -p build/.mutt
 	sed -e 's/LOCAL_PASS/$(LOCAL_PASS)/g' \
 	    -e 's/GMAIL_PASS/$(GMAIL_PASS)/g' \
-	    -e 's/QUEENSU_PASS/$(QUEENSU_PASS)/g' $< > $@
+	    -e 's/QUEENSU_PASS/$(QUEENSU_PASS)/g' \
+	    -e 's/MSMTP_PATH/$(MSMTP_PATH)/g' $< > $@
 
 build/.xinitrc: .xinitrc $(SUBSTS_FILE)
 	[ -d build ] || mkdir build
@@ -105,6 +114,7 @@ build/.xmonad/xmonad.hs: .xmonad/xmonad.hs $(SUBSTS_FILE)
 build/.zshrc: .zshrc $(SUBSTS_FILE)
 	[ -d $(dir $@) ] || mkdir -p $(dir $@)
 	sed -e 's/LOCALE/$(LOCALE)/g' \
+	    -e 's/MSMTP_PATH/$(MSMTP_PATH)/g' \
 	    -e 's/SUBSTS_LS/$(SUBSTS_LS)/g' $< > $@
 
 build/%: %