Only expand passwords if defined

6 files changed, 19 insertions, 4 deletions

diff --git a/dot_mutt/accounts/queensu.ca/private_read.rc.tmpl b/dot_mutt/accounts/queensu.ca/private_read.rc.tmpl
index 2e9ebc5..f23cb60 100644
--- a/dot_mutt/accounts/queensu.ca/private_read.rc.tmpl
+++ b/dot_mutt/accounts/queensu.ca/private_read.rc.tmpl
@@ -5,4 +5,5 @@ set imap_login = '9rak@queensu.ca'
 set imap_oauth_refresh_command = '~/bin/mutt_oauth2.py ~/.mutt/xoauth2-queensu.ca-token'
 set imap_passive = 'no'
 set imap_user = '9rak@queensu.ca'
+
 unset imap_pass
diff --git a/dot_mutt/accounts/rak.rak.ac/private_read.rc.tmpl b/dot_mutt/accounts/rak.rak.ac/private_read.rc.tmpl
index 5eec2e9..6e061ff 100644
--- a/dot_mutt/accounts/rak.rak.ac/private_read.rc.tmpl
+++ b/dot_mutt/accounts/rak.rak.ac/private_read.rc.tmpl
@@ -1,5 +1,7 @@
 # vim: syntax=muttrc
 
 set imap_delim_chars = '/'
+{{- if .password.rakac }}
 set imap_pass = '{{ .password.rakac }}'
+{{- end }}
 set imap_user = 'rak'
diff --git a/dot_mutt/accounts/rkavanag.alumni.cmu.edu/private_read.rc.tmpl b/dot_mutt/accounts/rkavanag.alumni.cmu.edu/private_read.rc.tmpl
index a2c6733..16febff 100644
--- a/dot_mutt/accounts/rkavanag.alumni.cmu.edu/private_read.rc.tmpl
+++ b/dot_mutt/accounts/rkavanag.alumni.cmu.edu/private_read.rc.tmpl
@@ -1,6 +1,8 @@
 # vim: syntax=muttrc
 
 set imap_keepalive = 60
+{{- if .password.cmu }}
 set imap_pass = '{{ .password.cmu }}'
+{{- end }}
 set imap_passive = 'no'
 set imap_user = 'rkavanag@alumni.cmu.edu'
diff --git a/dot_mutt/accounts/ryanakca.gmail.com/private_read.rc.tmpl b/dot_mutt/accounts/ryanakca.gmail.com/private_read.rc.tmpl
index c09f92a..837c2d5 100644
--- a/dot_mutt/accounts/ryanakca.gmail.com/private_read.rc.tmpl
+++ b/dot_mutt/accounts/ryanakca.gmail.com/private_read.rc.tmpl
@@ -1,5 +1,7 @@
 # vim: syntax=muttrc
 
+{{- if .password.gmail }}
 set imap_pass = '{{ .password.gmail }}'
+{{- end }}
 set imap_passive = 'no'
 set imap_user = 'ryanakca@gmail.com'
diff --git a/dot_mutt/accounts/ryank.mail.cs.mcgill.ca/private_read.rc.tmpl b/dot_mutt/accounts/ryank.mail.cs.mcgill.ca/private_read.rc.tmpl
index 9ac8fee..569c016 100644
--- a/dot_mutt/accounts/ryank.mail.cs.mcgill.ca/private_read.rc.tmpl
+++ b/dot_mutt/accounts/ryank.mail.cs.mcgill.ca/private_read.rc.tmpl
@@ -1,5 +1,7 @@
 # vim: syntax=muttrc
 
-set imap_user = 'ryank'
-set imap_pass = '{{ .password.socs }}'
 set imap_delim_chars = '.'
+{{- if .password.socs }}
+set imap_pass = '{{ .password.socs }}'
+{{- end }}
+set imap_user = 'ryank'
diff --git a/private_dot_netrc.tmpl b/private_dot_netrc.tmpl
index 5cff082..d74e7e1 100644
--- a/private_dot_netrc.tmpl
+++ b/private_dot_netrc.tmpl
@@ -1,6 +1,12 @@
+{{- if .password.cmu }}
 machine imap.gmail.com login rkavanag@alumni.cmu.edu password {{ .password.cmu }}
+{{- endif }}
+{{- if .password.gmail }}
 machine imap.gmail.com login ryanakca@gmail.com password {{ .password.gmail }}
+{{- endif }}
+{{- if .password.rakac }}
 machine imap.rak.ac login rak password {{ .password.rakac }}
-machine localhost login ryan password {{ .password.local }}
-machine pod51018.outlook.com login 9rak@queensu.ca password {{ .password.queensu }}
+{{- endif }}
+{{- if .password.socs }}
 machine mail.cs.mcgill.ca login ryank password {{ .password.socs }}
+{{- endif }}