From 9e3097c524b483e358f7641b90cccba894803c41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 5 May 2023 15:44:39 +0200 Subject: [PATCH] fix --- scripts/backup | 9 --------- scripts/config | 2 +- scripts/install | 12 ------------ scripts/remove | 7 ------- scripts/restore | 9 --------- 5 files changed, 1 insertion(+), 38 deletions(-) diff --git a/scripts/backup b/scripts/backup index 40b562e..17b1472 100644 --- a/scripts/backup +++ b/scripts/backup @@ -9,15 +9,6 @@ source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers -#================================================= -# LOAD SETTINGS -#================================================= -ynh_print_info --message="Loading installation settings..." - -with_mysql=$(ynh_app_setting_get --app=$app --key=with_mysql) -with_sftp=$(ynh_app_setting_get --app=$app --key=with_sftp) -db_name=$(ynh_app_setting_get --app=$app --key=db_name) - #================================================= # DECLARE DATA AND CONF FILES TO BACKUP #================================================= diff --git a/scripts/config b/scripts/config index 7763f7c..21b6f17 100644 --- a/scripts/config +++ b/scripts/config @@ -17,7 +17,7 @@ ynh_abort_if_errors install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) domain=$(ynh_app_setting_get --app=$app --key=domain) -path_url=$(ynh_app_setting_get --app=$app --key=path) +path=$(ynh_app_setting_get --app=$app --key=path) current_fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint) fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint) diff --git a/scripts/install b/scripts/install index 8280d3d..7568e4d 100644 --- a/scripts/install +++ b/scripts/install @@ -15,7 +15,6 @@ source /usr/share/yunohost/helpers password=$YNH_APP_ARG_PASSWORD app_nb=$YNH_APP_INSTANCE_NUMBER -phpversion=$YNH_APP_ARG_PHPVERSION ssh_port=$(grep "^Port" /etc/ssh/sshd_config | awk '{print $2}') #================================================= @@ -25,17 +24,6 @@ ynh_script_progression --message="Validating installation parameters..." --weigh [ $with_sftp -eq 0 ] || [ "$password" != "" ] || ynh_die --message="You need to set a password to enable SFTP" -#================================================= -# STORE SETTINGS FROM MANIFEST -#================================================= -ynh_script_progression --message="Storing installation settings..." - -ynh_app_setting_set --app=$app --key=password --value=$password -ynh_app_setting_set --app=$app --key=ssh_port --value=$ssh_port -ynh_app_setting_set --app=$app --key=with_mysql --value=$with_mysql -ynh_app_setting_set --app=$app --key=with_sftp --value=$with_sftp -ynh_app_setting_set --app=$app --key=phpversion --value=$phpversion - #================================================= # CREATE A MYSQL DATABASE #================================================= diff --git a/scripts/remove b/scripts/remove index 962cf23..f86af18 100644 --- a/scripts/remove +++ b/scripts/remove @@ -9,13 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# LOAD SETTINGS -#================================================= - -with_mysql=$(ynh_app_setting_get --app=$app --key=with_mysql) -with_sftp=$(ynh_app_setting_get --app=$app --key=with_sftp) - #================================================= # STANDARD REMOVE #================================================= diff --git a/scripts/restore b/scripts/restore index 68e97f0..8db3265 100644 --- a/scripts/restore +++ b/scripts/restore @@ -9,15 +9,6 @@ source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers -#================================================= -# LOAD SETTINGS -#================================================= -ynh_script_progression --message="Loading settings..." --weight=2 - -with_mysql=$(ynh_app_setting_get --app=$app --key=with_mysql) -with_sftp=$(ynh_app_setting_get --app=$app --key=with_sftp) -password=$(ynh_app_setting_get --app=$app --key=password) - #================================================= # RESTORE THE NGINX CONFIGURATION #=================================================