From b6e043b5e1d99332804af7eb140503fea6a80164 Mon Sep 17 00:00:00 2001 From: Limezy Date: Fri, 25 Mar 2022 08:31:25 +0700 Subject: [PATCH] Redirect to stdout --- scripts/install | 2 +- scripts/upgrade | 17 ++++++----------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/scripts/install b/scripts/install index ea54c61..0bcc85d 100755 --- a/scripts/install +++ b/scripts/install @@ -119,7 +119,7 @@ pushd "$final_path" ynh_use_go "$ynh_go" env # Build server from source - make build + make build 2>&1 # Setup a nice Yunohost logo cp /usr/share/yunohost/admin/img/logo.08bab97e.png web/themes/light/logo.png popd diff --git a/scripts/upgrade b/scripts/upgrade index 6cee910..48afeba 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -85,14 +85,6 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." - # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading PHP-FPM configuration..." --time --weight=1 - -# Create a dedicated PHP-FPM config -ynh_add_fpm_config - #================================================= # SPECIFIC UPGRADE #================================================= @@ -104,10 +96,13 @@ ynh_script_progression --message="Building the sources (it will take some time). ynh_exec_warn_less ynh_install_go --go_version=$GO_VERSION pushd "$final_path" - # Build the sources + # Setup go exe and environnement ynh_use_go - unset GOPATH - make build + "$ynh_go" env + # Build server from source + make build 2>&1 + # Setup a nice Yunohost logo + cp /usr/share/yunohost/admin/img/logo.08bab97e.png web/themes/light/logo.png popd ynh_remove_go