From 53e8ff7ed3cdec9385d193fa29729f63287b313a Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Date: Tue, 10 Jul 2018 23:43:14 +0200 Subject: [PATCH] upgrade ynh_send_readme_to_admin helper if mail binary isn't properly selected, it may create an infinite loop at install --- scripts/_common.sh | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 5c0b7f7..cf6b544 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -117,12 +117,25 @@ ynh_send_readme_to_admin() { local mail_subject="☁️🆈🅽🅷☁️: \`$app\` was just installed!" local mail_message="This is an automated message from your beloved YunoHost server. + Specific information for the application $app. + $app_message + --- Automatic diagnosis data from YunoHost + $(yunohost tools diagnosis | grep -B 100 "services:" | sed '/services:/d')" + # Define binary to use for mail command + if [ -e /usr/bin/bsd-mailx ] + then + local mail_bin=/usr/bin/bsd-mailx + else + local mail_bin=/usr/bin/mail.mailutils + fi + # Send the email to the recipients - echo "$mail_message" | mail -a "Content-Type: text/plain; charset=UTF-8" -s "$mail_subject" "$recipients" + echo "$mail_message" | $mail_bin -a "Content-Type: text/plain; charset=UTF-8" -s "$mail_subject" "$recipients" } +