Browse Source

always a new line before EOF of heredoc

pull/276/head
Roland Puntaier 5 years ago
parent
commit
5c66f6cf89
1 changed files with 9 additions and 0 deletions
  1. +9
    -0
      bin/mw

+ 9
- 0
bin/mw View File

@@ -172,6 +172,7 @@ auth on
tls on
tls_trust_file $mwsslcert
#logfile ${XDG_LOG_HOME:-$HOME}/msmtp.log

EOF
else
sed -i "/account $mwaddr/,/^\(\s*$\|account\)/d" "$mwmsmtprc" &>/dev/null
@@ -184,6 +185,7 @@ from $mwaddr
user $mwlogin
passwordeval "pass $mwpass"
$mwstarttlsoff

EOF
case "$mwservice" in
protonmail.ch|protonmail.com|pm.me) _mwprotonfinger || return 1 ;;
@@ -222,6 +224,7 @@ Create Both
SyncState *
MaxMessages 0
# End $_MW_ profile

EOF
}

@@ -245,6 +248,7 @@ delete = true
#message_log = ${XDG_LOG_HOME:-$HOME}/getmail.log

# vim: ft=conf

EOF
}

@@ -323,6 +327,7 @@ exclude_tags=deleted;spam;
synchronize_flags=true
[crypto]
gpg_path=$GPG"

EOF
}

@@ -484,6 +489,7 @@ _mwgenmwaccmuttrc() {
# generated by $_MW_

set from = "$mwaddr"

EOF
if [ "$mwtype" = "offline" ]; then
cat >> "$mwaccmuttrc" <<EOF
@@ -530,12 +536,14 @@ set ssl_starttls = ${mwssl/nos/yes}
set ssl_force_tls = ${mwssl/nos/yes}

set smtp_pass = "\`pass $mwpass\`"

EOF
fi # imap
#smtp
[ "$mwsport" = "25" ] && mwsmtp="smtp" || mwsmtp="smtps"
cat >> "$mwaccmuttrc" <<EOF
set smtp_url = "$mwsmtp://$mwlogin@$mwsurl:$mwsport"

EOF
fi #online
mwboxes="$(echo "$mwmailboxes" | sed -e "s/^ //g;s/.*/\"=\0\"/g" | tr "\n" " ")"
@@ -555,6 +563,7 @@ EOF
[ -n "$mwname" ] && cat >> "$mwaccmuttrc" <<EOF
set realname = "$mwname"
alias me $mwname <$mwaddr>

EOF
IFS=$'\n'
for eqbox in $mwmailboxes; do


Loading…
Cancel
Save