From 1f56d1d4ac9c346cf9de6d271e725fd6be6e488f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Sat, 10 Jun 2023 18:29:40 +0200 Subject: [PATCH] Cleanup _common.sh --- scripts/_common.sh | 66 +++------------------------------------------- 1 file changed, 4 insertions(+), 62 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index e6f4152..541cacb 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -17,13 +17,13 @@ build_fider() { ynh_secure_remove -f "$install_dir/app" mkdir -p "$install_dir/app" - pushd "$install_dir/sources" + pushd "$install_dir/sources" || ynh_die --message "Could not move into $install_dir/sources!" # Build server ynh_exec_as "$app" \ GOPATH="$install_dir/go_build/go" \ GOCACHE="$install_dir/go_build/.cache" \ GOOS=linux GOARCH="$(dpkg --print-architecture)" \ - PATH=/usr/lib/go-1.18/bin:$PATH \ + "PATH=/usr/lib/go-1.18/bin:$PATH" \ make build-server cp -R migrations views locale LICENSE fider "$install_dir/app" @@ -33,8 +33,8 @@ build_fider() { ynh_exec_as "$app" $ynh_node_load_PATH make build-ssr ynh_exec_as "$app" $ynh_node_load_PATH make build-ui cp -R favicon.png dist robots.txt ssr.js "$install_dir/app" - popd - chown $app:www-data -R "$install_dir/app" + popd || ynh_die + chown "$app:www-data" -R "$install_dir/app" } #================================================= @@ -46,61 +46,3 @@ install_golang_from_backports() { --repo="deb http://deb.debian.org/debian $(ynh_get_debian_release)-backports main contrib non-free" \ --package="$pkg_dependency_golang" } - -#================================================= -# FUTURE OFFICIAL HELPERS -#================================================= - -# Send an email to inform the administrator -# -# usage: ynh_send_readme_to_admin app_message [recipients] -# | arg: app_message - The message to send to the administrator. -# | arg: recipients - The recipients of this email. Use spaces to separate multiples recipients. - default: root -# example: "root admin@domain" -# If you give the name of a YunoHost user, ynh_send_readme_to_admin will find its email adress for you -# example: "root admin@domain user1 user2" -ynh_send_readme_to_admin() { - local app_message="${1:-...No specific information...}" - local recipients="${2:-root}" - - # Retrieve the email of users - find_mails () { - local list_mails="$1" - local mail - local recipients=" " - # Read each mail in argument - for mail in $list_mails - do - # Keep root or a real email address as it is - if [ "$mail" = "root" ] || echo "$mail" | grep --quiet "@" - then - recipients="$recipients $mail" - else - # But replace an user name without a domain after by its email - if mail=$(ynh_user_get_info "$mail" "mail" 2> /dev/null) - then - recipients="$recipients $mail" - fi - fi - done - echo "$recipients" - } - recipients=$(find_mails "$recipients") - - 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" - - # 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_bin -a "Content-Type: text/plain; charset=UTF-8" -s "$mail_subject" "$recipients" -}