mail: fix incorrect email usernames
This commit is contained in:
parent
f9f5a08e3a
commit
aee8005abc
|
@ -37,7 +37,7 @@ variables:
|
|||
user: lelgenio
|
||||
mail: disroot.org
|
||||
work:
|
||||
user: leonardo
|
||||
user: leonardo@wopus.com.br
|
||||
mail: wopus.com.br
|
||||
|
||||
###############################################################
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
[user]
|
||||
name = {{@@ mail.work.user | capitalize @@}}
|
||||
email = {{@@ mail.work.user @@}}@{{@@ mail.work.mail @@}}
|
||||
name = {{@@ mail.work.user.split("@")[0] | capitalize @@}}
|
||||
email = {{@@ mail.work.user.split("@")[0] @@}}@{{@@ mail.work.mail @@}}
|
||||
|
||||
# vim: ft=ini
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
IMAPStore {{@@ name @@}}-remote
|
||||
Host {{@@ info.mail @@}}
|
||||
Port 993
|
||||
User {{@@ info.user @@}}@{{@@ info.mail @@}}
|
||||
User {{@@ info.user.split("@")[0] @@}}@{{@@ info.mail @@}}
|
||||
PassCmd "_pass_get {{@@ info.mail @@}}"
|
||||
SSLType IMAPS
|
||||
CertificateFile /etc/ssl/certs/ca-certificates.crt
|
||||
|
|
|
@ -19,7 +19,7 @@ set ssl_force_tls = yes
|
|||
|
||||
{%@@ for name, info in mail.items() | reverse @@%}
|
||||
set my_source_command = \
|
||||
"_mutt_get-mail '{{@@ name @@}}' '{{@@ info.user @@}}' '{{@@ info.mail @@}}' |"
|
||||
"_mutt_get-mail '{{@@ name @@}}' '{{@@ info.user.split("@")[0] @@}}' '{{@@ info.user @@}}' '{{@@ info.mail @@}}' |"
|
||||
|
||||
folder-hook "$my_mailroot/{{@@ name @@}}/" \
|
||||
source "\"$my_source_command\""
|
||||
|
@ -28,7 +28,7 @@ set my_source_command = \
|
|||
|
||||
{%@@ for name, info in mail.items() @@%}
|
||||
set my_source_command = \
|
||||
"_mutt_get-mail '{{@@ name @@}}' '{{@@ info.user @@}}' '{{@@ info.mail @@}}' |"
|
||||
"_mutt_get-mail '{{@@ name @@}}' '{{@@ info.user.split("@")[0] @@}}' '{{@@ info.user @@}}' '{{@@ info.mail @@}}' |"
|
||||
macro index,pager <f{{@@ loop.index @@}}> "<sync-mailbox><enter-command>source \"$my_source_command\"<enter><change-folder>!<enter>"
|
||||
{%@@ endfor @@%}
|
||||
|
||||
|
|
|
@ -1,14 +1,16 @@
|
|||
#!/bin/sh
|
||||
|
||||
my_path="$1"
|
||||
my_user="$2"
|
||||
my_host="$3"
|
||||
my_name="$2"
|
||||
my_user="$3"
|
||||
my_host="$4"
|
||||
my_pass=`_pass_get "$my_host"`
|
||||
|
||||
cat <<EOF
|
||||
set realname = "$my_user"
|
||||
set from = "${my_user}@${my_host}"
|
||||
set smtp_url = "smtps://${my_user}:${my_pass}@${my_host}"
|
||||
set realname = "$my_name"
|
||||
set from = "${my_name}@${my_host}"
|
||||
set smtp_url = 'smtps://${my_user}@${my_host}'
|
||||
set smtp_pass = '$my_pass'
|
||||
|
||||
# set Mailboxes
|
||||
set folder = ~/.local/share/mail/${my_path}/
|
||||
|
|
Reference in New Issue