From 4c713979ea10646df3a9076882bf38f0a7df1a9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 21 Feb 2023 15:35:08 +0100 Subject: [PATCH] fix --- scripts/install | 8 +------- scripts/restore | 5 ----- scripts/upgrade | 6 ------ 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/scripts/install b/scripts/install index 78dae6c..7d41267 100644 --- a/scripts/install +++ b/scripts/install @@ -25,7 +25,7 @@ useldap=$YNH_APP_ARG_USELDAP #================================================= # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS #================================================= -#REMOVEME? ynh_script_progression --message="Validating installation parameters..." --weight=1 +ynh_script_progression --message="Validating installation parameters..." --weight=1 if [ "${#password}" -lt 8 ] || [ "${#password}" -gt 30 ] then @@ -49,12 +49,6 @@ ynh_app_setting_set --app=$app --key=overwrite_systemd --value="1" #================================================= ynh_script_progression --message="Installing dependencies..." --weight=120 -if [ "$export" = "abiword" ]; then - ynh_exec_warn_less ynh_install_app_dependencies $abiword_app_depencencies -elif [ "$export" = "libreoffice" ]; then - ynh_exec_warn_less ynh_install_app_dependencies $libreoffice_app_dependencies -fi - ynh_install_nodejs --nodejs_version=$nodejs_version ynh_use_nodejs diff --git a/scripts/restore b/scripts/restore index 111f6c3..1232a1b 100644 --- a/scripts/restore +++ b/scripts/restore @@ -52,11 +52,6 @@ ynh_systemd_action --action=restart --service_name=fail2ban #================================================= ynh_script_progression --message="Reinstalling dependencies..." --weight=60 -if [ "$export" = "abiword" ]; then - ynh_exec_warn_less ynh_install_app_dependencies $abiword_app_depencencies -elif [ "$export" = "libreoffice" ]; then - ynh_exec_warn_less ynh_install_app_dependencies $libreoffice_app_dependencies -fi ynh_install_nodejs --nodejs_version=$nodejs_version ynh_use_nodejs diff --git a/scripts/upgrade b/scripts/upgrade index 5bf2907..a403907 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -156,12 +156,6 @@ chown -R $app:$app "$install_dir" #================================================= ynh_script_progression --message="Upgrading dependencies..." --weight=5 -if [ "$export" = "abiword" ]; then - ynh_exec_warn_less ynh_install_app_dependencies $abiword_app_depencencies -elif [ "$export" = "libreoffice" ]; then - ynh_exec_warn_less ynh_install_app_dependencies $libreoffice_app_dependencies -fi - ynh_install_nodejs --nodejs_version=$nodejs_version ynh_use_nodejs