mirror of
https://github.com/YunoHost-Apps/borg_ynh.git
synced 2024-09-03 18:16:05 +02:00
Merge pull request #161 from CodeShakingSheep/fix-mail-encoding-and-typos
Fix mail encoding and typos
This commit is contained in:
commit
053e26943a
2 changed files with 4 additions and 4 deletions
|
@ -1,7 +1,7 @@
|
||||||
# All available README files by language
|
# All available README files by language
|
||||||
|
|
||||||
- [Read the README in English](README.md)
|
- [Read the README in English](README.md)
|
||||||
- [Lee el README en español](README_es.md)
|
- [Lea el README en español](README_es.md)
|
||||||
- [Irakurri README euskaraz](README_eu.md)
|
- [Irakurri README euskaraz](README_eu.md)
|
||||||
- [Lire le README en français](README_fr.md)
|
- [Lire le README en français](README_fr.md)
|
||||||
- [Le o README en galego](README_gl.md)
|
- [Le o README en galego](README_gl.md)
|
||||||
|
|
|
@ -60,7 +60,7 @@ for application in $(sudo ls /etc/yunohost/apps/); do
|
||||||
done
|
done
|
||||||
|
|
||||||
#=========================================================
|
#=========================================================
|
||||||
# SEND MAIL TO NOTIFY SUCCED OR FAILED OPERATIONS
|
# SEND MAIL TO NOTIFY ABOUT SUCCEEDED OR FAILED OPERATIONS
|
||||||
#=========================================================
|
#=========================================================
|
||||||
|
|
||||||
partial_errors="$(cat "$log_file" | grep -E "Error|Skipped")"
|
partial_errors="$(cat "$log_file" | grep -E "Error|Skipped")"
|
||||||
|
@ -79,9 +79,9 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -n "$errors" && $mailalert != "never" ]]; then
|
if [[ -n "$errors" && $mailalert != "never" ]]; then
|
||||||
cat <(echo -e "$errors\n\n\n") "$log_file" "$err_file" | mail -s "[borg] Backup failed from $domain onto $repository" root
|
cat <(echo -e "$errors\n\n\n") "$log_file" "$err_file" | mail -a "Content-Type: text/plain; charset=UTF-8" -s "[borg] Backup failed from $domain onto $repository" root
|
||||||
exit 1
|
exit 1
|
||||||
elif [ "$mailalert" == "always" ]; then
|
elif [ "$mailalert" == "always" ]; then
|
||||||
cat "$log_file" | mail -s "[borg] Backup succeed from $domain onto $repository" root
|
cat "$log_file" | mail -a "Content-Type: text/plain; charset=UTF-8" -s "[borg] Backup succeeded from $domain onto $repository" root
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Add table
Reference in a new issue