From 33360638fb7a8783e4e16629a788da814ce4974f Mon Sep 17 00:00:00 2001 From: Ryan Kavanagh Date: Thu, 18 Aug 2011 20:12:25 -0400 Subject: Handle path to msmtp --- .gitconfig | 2 +- .mutt/accounts.rc | 8 ++++---- .muttrc | 4 ++-- .zshrc | 2 +- SUBSTS | 3 +++ dm | 12 +++++++++++- 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 "cimaps://imap.gmail.com/INBOX" macro index "cimap://localhost/INBOX" macro index "cimaps://mail.queensu.ca/Inbox" -macro compose 'set sendmail="/usr/bin/msmtp -a ubuntu"unset smtp_urlunset smtp_passRyan Kavanagh ryanakca@ubuntu.comset postponed="=[Google Mail]/Drafts"' "Sent mail from Ubuntu account" -macro compose 'set sendmail="/usr/bin/msmtp"unset smtp_urlunset smtp_passRyan Kavanagh ryanakca@kubuntu.orgset postponed="=[Google Mail]/Drafts"' "Sent mail from Kubuntu account" +macro compose 'set sendmail="MSMTP_PATH -a ubuntu"unset smtp_urlunset smtp_passRyan Kavanagh ryanakca@ubuntu.comset postponed="=[Google Mail]/Drafts"' "Sent mail from Ubuntu account" +macro compose 'set sendmail="MSMTP_PATH"unset smtp_urlunset smtp_passRyan Kavanagh ryanakca@kubuntu.orgset postponed="=[Google Mail]/Drafts"' "Sent mail from Kubuntu account" macro compose 'unset sendmailRyan Kavanagh ryan.kavanagh@queensu.ca=QueensU.Sentset postponed="=QueensU.Drafts"set smtp_url="smtps://9rak@mail.queensu.ca:465/"set smtp_pass="QUEENSU_PASS"set record="=QueensU.Sent"' "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 \ "unset wait_key~/bin/mutt-notmuch thread~/.cache/mutt_resultsset wait_key" \ "search and reconstruct owning thread (using notmuch)" -macro index \e,k " set sendmail='/usr/bin/msmtp'\ +macro index \e,k " set sendmail='MSMTP_PATH'\ set from = 'Ryan Kavanagh '\ set envelope_from_address = 'Ryan Kavanagh '\ set use_from = yes\ @@ -147,4 +147,4 @@ macro index \e,k " set sendmail='/usr/bin/msmtp'\ my_hdr From: ryanakca@kubuntu.org\ my_hdr Reply-To: ryanakca@kubuntu.org\ my_hdr Return-Path: ryanakca@kubuntu.org" -macro index \e,u " set sendmail='/usr/bin/msmtp -a ubuntu'set from = 'Ryan Kavanagh 'set envelope_from_address = 'Ryan Kavanagh 'set use_from = yesset use_envelope_from = 'yes'my_hdr From: ryanakca@ubuntu.commy_hdr Reply-To: ryanakca@ubuntu.commy_hdr Return-Path: ryanakca@ubuntu.com" +macro index \e,u " set sendmail='MSMTP_PATH -a ubuntu'set from = 'Ryan Kavanagh 'set envelope_from_address = 'Ryan Kavanagh 'set use_from = yesset use_envelope_from = 'yes'my_hdr From: ryanakca@ubuntu.commy_hdr Reply-To: ryanakca@ubuntu.commy_hdr Return-Path: ryanakca@ubuntu.com" 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/%: % -- cgit v1.2.3