diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2020-06-26 12:06:25 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2020-06-26 12:06:25 +0300 |
commit | 865e66a4b1a536b024a1db7431ded7a24a84e598 (patch) | |
tree | ed9352e5b28adb03fe8f57ff9d14cd99efff1f18 | |
parent | 66f06e2daeb2952a5dba017f03606b48c3ce4dec (diff) | |
download | beam-865e66a4b1a536b024a1db7431ded7a24a84e598.tar.gz beam-865e66a4b1a536b024a1db7431ded7a24a84e598.tar.bz2 |
* lib/beam/common.in (construct_mail_header): New function.
(mail_report): Build mail headers using construct_mail_header.
-rw-r--r-- | lib/beam/common.in | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/lib/beam/common.in b/lib/beam/common.in index e8389f9..4d6442f 100644 --- a/lib/beam/common.in +++ b/lib/beam/common.in @@ -194,12 +194,25 @@ wtf() { dry_mail() { echo "=============================================================" cat - echo "=============================================================" } +# construct_mail_header NAME VALUE +construct_mail_header() { + local name value + name=$(echo "mail_header_$1"|tr 'A-Z' 'a-z'|tr '-' '_') + value=$(echo "$1: $2" |\ + tr '\n' ' ' |\ + tr '\t' ' ' |\ + tr -s ' ' |\ + fmt -w64 -s |\ + sed -e '2,$s/^/ /') + eval $name='$value' +} + # mail_report FILE mail_report() { : ${backup_mailer_program:=/usr/sbin/sendmail -oi -t -F $backup_sender_email} if [ -n "$dry_run" ]; then echo "Sending mail using $backup_mailer_program" backup_mailer_program=dry_mail @@ -220,17 +233,21 @@ mail_report() { fi if [ -z "$backup_report_subject" ]; then backup_report_subject="Backup of $(hostname) on $(date)" fi test -n "$backup_report_signature" && echo "$backup_report_signature" >> $report - (cat - <<EOF -From: ${backup_sender_personal}$backup_sender_email -To: $backup_notify_email -Subject: $backup_report_subject -X-Beam-Items: $backup_items + (construct_mail_header From "${backup_sender_personal}$backup_sender_email" + construct_mail_header To "$backup_notify_email" + construct_mail_header Subject "$backup_report_subject" + construct_mail_header X-Beam-Items "$backup_items" + cat - <<EOF +$mail_header_from +$mail_header_to +$mail_header_subject +$mail_header_x_beam_items X-Beam-Round: $round X-Beam-Level: $level EOF if [ -n "$backup_report_headers" ]; then echo "$backup_report_headers" fi |