ambiser
/
btrbk
mirror of https://github.com/digint/btrbk
9
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrbk-mail: do not use echo -e

pull/504/head
Axel Burri 2022-11-19 16:42:35 +01:00
parent f52de197d6
commit 65886f10fd
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
contrib/cron/btrbk-mail
View File

@ -55,6 +55,8 @@ btrbk_opts="-c /etc/btrbk/btrbk.conf"
#mail_cmd_block_prefix='\\u200B' # zero-width whitespace #mail_cmd_block_prefix='\\u200B' # zero-width whitespace
#mail_cmd_block_prefix=". " #mail_cmd_block_prefix=". "
# Newline character
BR=$'\n'
##### end config section ##### ##### end config section #####
@ -83,47 +85,47 @@ send_mail()
body+="$info" body+="$info"
fi fi
if [[ -n "$detail" ]] && [[ -n "$has_errors" ]] || [[ "${mail_detail:-no}" = "yes" ]]; then if [[ -n "$detail" ]] && [[ -n "$has_errors" ]] || [[ "${mail_detail:-no}" = "yes" ]]; then
[[ -n "$body" ]] && body+="\n\nDETAIL:\n" [[ -n "$body" ]] && body+="${BR}${BR}DETAIL:${BR}"
body+="$detail" body+="$detail"
fi fi
# skip sending mail on empty body # skip sending mail on empty body
if [[ -z "$body" ]] && [[ -n "$has_errors" ]]; then if [[ -z "$body" ]] && [[ -n "$has_errors" ]]; then
body+="FATAL: something went wrong (errors present but empty mail body)\n" body+="FATAL: something went wrong (errors present but empty mail body)${BR}"
fi fi
[[ -z "$body" ]] && exit 0 [[ -z "$body" ]] && exit 0
# send mail # send mail
echo -e "$body" | mail -s "$subject" $mailto echo "$body" | mail -s "$subject" $mailto
if [[ $? -ne 0 ]]; then if [[ $? -ne 0 ]]; then
echo -e "$0: Failed to send btrbk mail to \"$mailto\", dumping mail:\n" 1>&2 echo "$0: Failed to send btrbk mail to \"$mailto\", dumping mail:${BR}" 1>&2
echo -e "<mail_subject>$subject</mail_subject>\n<mail_body>\n$body</mail_body>" 1>&2 echo "<mail_subject>$subject</mail_subject>${BR}<mail_body>${BR}$body</mail_body>" 1>&2
fi fi
} }
einfo() einfo()
{ {
info+="$1\n" info+="$1${BR}"
} }
ebegin() ebegin()
{ {
ebtext=$1 ebtext=$1
detail+="\n### $1\n" detail+="${BR}### $1${BR}"
} }
eend() eend()
{ {
if [[ $1 -eq 0 ]]; then if [[ $1 -eq 0 ]]; then
eetext=${3-success} eetext=${3-success}
detail+="\n" detail+="${BR}"
else else
has_errors=1 has_errors=1
eetext="ERROR (code=$1)" eetext="ERROR (code=$1)"
[[ -n "$2" ]] && eetext+=": $2" [[ -n "$2" ]] && eetext+=": $2"
detail+="\n### $eetext\n" detail+="${BR}### $eetext${BR}"
fi fi
info+="$ebtext: $eetext\n" info+="$ebtext: $eetext${BR}"
return $1 return $1
} }
@ -139,10 +141,10 @@ run_cmd()
{ {
cmd_out=$("$@" 2>&1) cmd_out=$("$@" 2>&1)
local ret=$? local ret=$?
detail+="++ ${@@Q}\n" detail+="++ ${@@Q}${BR}"
if [[ -n "${mail_cmd_block_prefix:-}" ]] && [[ -n "$cmd_out" ]]; then if [[ -n "${mail_cmd_block_prefix:-}" ]] && [[ -n "$cmd_out" ]]; then
detail+=$(echo -n "$cmd_out" | sed "s/^/${mail_cmd_block_prefix}/") detail+=$(echo -n "$cmd_out" | sed "s/^/${mail_cmd_block_prefix}/")
detail+="\n" detail+="${BR}"
else else
detail+=$cmd_out detail+=$cmd_out
fi fi
@ -159,7 +161,7 @@ mount_all()
if [[ $? -eq 0 ]]; then if [[ $? -eq 0 ]]; then
eend -1 "already mounted" eend -1 "already mounted"
else else
detail+="\n" detail+="${BR}"
run_cmd mount --target $mountpoint run_cmd mount --target $mountpoint
eend $? && mounted+=" $mountpoint" eend $? && mounted+=" $mountpoint"
fi fi