From a7078863ac42723cfd29854b5c3e354fb31ae5f4 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 16 Oct 2020 14:06:51 +0200 Subject: [PATCH] improve mail message --- scripts/_common.sh | 4 +++- scripts/install | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index c047f44..1c686cb 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -59,7 +59,9 @@ ynh_send_readme_to_admin() { local mail_subject="☁️🆈🅽🅷☁️: \`$app\` has important message for you" - local mail_message="This is an automated message from your beloved YunoHost server. \nSpecific information for the application $app.\n$app_message\n---\nAutomatic diagnosis data from YunoHost\n$(yunohost tools diagnosis | grep -B 100 "services:" | sed '/services:/d')" + local mail_message="This is an automated message from your beloved YunoHost server. + Specific information for $app. + $app_message" # Define binary to use for mail command if [ -e /usr/bin/bsd-mailx ] diff --git a/scripts/install b/scripts/install index d0251cd..b117ac5 100755 --- a/scripts/install +++ b/scripts/install @@ -171,7 +171,7 @@ ynh_systemd_action --service_name=nginx --action=reload # SEND A README FOR THE ADMIN #================================================= -message=" $app was successfully installed :) \n +message=" Webtrees was successfully installed :) Please open https://$domain$path_url @@ -179,7 +179,7 @@ Your credentials for the admin panel are: - admin username: $admin_username - admin password: $password -If you facing an issue or want to improve this app, please open a new issue in this project: https://github.com/YunoHost-Apps/Webtrees_ynh" +If you facing an issue or want to improve Webtrees, please open a new issue in this project: https://github.com/YunoHost-Apps/webtrees_ynh" ynh_send_readme_to_admin "$message"