Browse Source
try to use ACCOUNT_MAIL if MAIL_FROM is not set
pull/2259/head
Honza Hommer
6 years ago
No known key found for this signature in database
GPG Key ID: 5EBDE8E7E1A00ACA
1 changed files with
13 additions and
3 deletions
-
notify/mail.sh
|
|
@ -37,11 +37,21 @@ mail_send() { |
|
|
fi |
|
|
fi |
|
|
|
|
|
|
|
|
MAIL_TO="${MAIL_TO:-$(_readaccountconf_mutable MAIL_TO)}" |
|
|
MAIL_TO="${MAIL_TO:-$(_readaccountconf_mutable MAIL_TO)}" |
|
|
if [ -z "$MAIL_TO" ]; then |
|
|
|
|
|
|
|
|
if [ -n "$MAIL_TO" ]; then |
|
|
|
|
|
if ! _contains "$MAIL_TO" "@"; then |
|
|
|
|
|
_err "It seems that the MAIL_TO=$MAIL_TO is not a valid email address." |
|
|
|
|
|
return 1 |
|
|
|
|
|
fi |
|
|
|
|
|
|
|
|
|
|
|
_saveaccountconf_mutable MAIL_TO "$MAIL_TO" |
|
|
|
|
|
else |
|
|
MAIL_TO="$(_readaccountconf ACCOUNT_EMAIL)" |
|
|
MAIL_TO="$(_readaccountconf ACCOUNT_EMAIL)" |
|
|
_info "The MAIL_TO is not set, so use the account email: $MAIL_TO" |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if [ -z "$MAIL_TO" ]; then |
|
|
|
|
|
_err "It seems that account email is empty." |
|
|
|
|
|
return 1 |
|
|
|
|
|
fi |
|
|
fi |
|
|
fi |
|
|
_saveaccountconf_mutable MAIL_TO "$MAIL_TO" |
|
|
|
|
|
|
|
|
|
|
|
contenttype="text/plain; charset=utf-8" |
|
|
contenttype="text/plain; charset=utf-8" |
|
|
subject="=?UTF-8?B?$(echo "$_subject" | _base64)?=" |
|
|
subject="=?UTF-8?B?$(echo "$_subject" | _base64)?=" |
|
|
|
