From c8fce891ac3ad754d092b97c886ea2d604698a9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 14 Dec 2023 17:02:02 +0100 Subject: [PATCH] fix --- scripts/_common.sh | 13 +++++++++---- scripts/backup | 1 - scripts/install | 2 ++ scripts/remove | 2 -- scripts/upgrade | 1 - 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 5185c92..944a65e 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,9 +4,14 @@ # COMMON VARIABLES #================================================= -#REMOVEME? YNH_PHP_VERSION="8.0" +#================================================= +# PERSONAL HELPERS +#================================================= -# dependencies used by the app -#REMOVEME? php_dependencies="php${YNH_PHP_VERSION}-redis php${YNH_PHP_VERSION}-mysql" +#================================================= +# EXPERIMENTAL HELPERS +#================================================= -#REMOVEME? pkg_dependencies="$php_dependencies" +#================================================= +# FUTURE OFFICIAL HELPERS +#================================================= diff --git a/scripts/backup b/scripts/backup index 7792996..21c72b3 100755 --- a/scripts/backup +++ b/scripts/backup @@ -6,7 +6,6 @@ # IMPORT GENERIC HELPERS #================================================= -# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers diff --git a/scripts/install b/scripts/install index fc35f80..ae85d63 100755 --- a/scripts/install +++ b/scripts/install @@ -9,6 +9,8 @@ source _common.sh source /usr/share/yunohost/helpers +email=$(ynh_user_get_info --username=$admin --key=mail) + #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= diff --git a/scripts/remove b/scripts/remove index 61db822..ac762c0 100755 --- a/scripts/remove +++ b/scripts/remove @@ -14,10 +14,8 @@ source /usr/share/yunohost/helpers #================================================= ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1 -# Remove the dedicated NGINX config ynh_remove_nginx_config -# Remove the dedicated PHP-FPM config ynh_remove_fpm_config #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index faea531..6fa03fc 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -45,7 +45,6 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1 ynh_add_fpm_config -# Create a dedicated NGINX config ynh_add_nginx_config #=================================================