From 044a29a9aba15348ca8525c04f14a457403facef Mon Sep 17 00:00:00 2001 From: yalh76 Date: Tue, 24 Mar 2020 19:59:28 +0100 Subject: [PATCH] reorder dependencies between stretch and buster --- scripts/install | 6 +++--- scripts/restore | 6 +++--- scripts/upgrade | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/install b/scripts/install index 2288499..32704ba 100644 --- a/scripts/install +++ b/scripts/install @@ -69,11 +69,11 @@ ynh_app_setting_set --app=$app --key=install_profil --value=$install_profil # INSTALL PHP7.3 #================================================= -if [ "$(lsb_release --codename --short)" = "stretch" ]; then +if [ "$(lsb_release --codename --short)" = "buster" ]; then + pkg_dependencies="$pkg_dependencies $extra_pkg_dependencies" +else ynh_print_info --message="Installing PHP7.3..." ynh_install_php --phpversion="7.3" --package="$extra_pkg_dependencies" -else - pkg_dependencies="$pkg_dependencies $extra_pkg_dependencies" fi #================================================= diff --git a/scripts/restore b/scripts/restore index 62d0cef..ef098fa 100644 --- a/scripts/restore +++ b/scripts/restore @@ -85,11 +85,11 @@ chown -R $app: $final_path # REINSTALL PHP7.3 #================================================= -if [ "$(lsb_release --codename --short)" = "stretch" ]; then +if [ "$(lsb_release --codename --short)" = "buster" ]; then + pkg_dependencies="$pkg_dependencies $extra_pkg_dependencies" +else ynh_print_info --message="Reinstalling PHP7.3..." ynh_install_php --phpversion="7.3" --package="$extra_pkg_dependencies" -else - pkg_dependencies="$pkg_dependencies $extra_pkg_dependencies" fi #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index ef21b59..6abbdea 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -89,7 +89,9 @@ ynh_add_nginx_config # UPGRADE PHP7.3 #================================================= -if [ "$(lsb_release --codename --short)" = "stretch" ]; then +if [ "$(lsb_release --codename --short)" = "buster" ]; then + pkg_dependencies="$pkg_dependencies $extra_pkg_dependencies" +else if [ "$(ynh_app_setting_get --app=$app --key=php_version)" != "7.3" ]; then ynh_print_info --message="Upgrading PHP7.3..." ynh_remove_fpm_config @@ -97,8 +99,6 @@ if [ "$(lsb_release --codename --short)" = "stretch" ]; then ynh_remove_php ynh_install_php --phpversion="7.3" --package="$extra_pkg_dependencies" fi -else - pkg_dependencies="$pkg_dependencies $extra_pkg_dependencies" fi #=================================================