1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/drupal_ynh.git synced 2024-09-03 18:35:53 +02:00

reorder dependencies between stretch and buster

This commit is contained in:
yalh76 2020-03-24 19:59:28 +01:00
parent e6ed8d21a0
commit 044a29a9ab
3 changed files with 9 additions and 9 deletions

View file

@ -69,11 +69,11 @@ ynh_app_setting_set --app=$app --key=install_profil --value=$install_profil
# INSTALL PHP7.3 # 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_print_info --message="Installing PHP7.3..."
ynh_install_php --phpversion="7.3" --package="$extra_pkg_dependencies" ynh_install_php --phpversion="7.3" --package="$extra_pkg_dependencies"
else
pkg_dependencies="$pkg_dependencies $extra_pkg_dependencies"
fi fi
#================================================= #=================================================

View file

@ -85,11 +85,11 @@ chown -R $app: $final_path
# REINSTALL PHP7.3 # 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_print_info --message="Reinstalling PHP7.3..."
ynh_install_php --phpversion="7.3" --package="$extra_pkg_dependencies" ynh_install_php --phpversion="7.3" --package="$extra_pkg_dependencies"
else
pkg_dependencies="$pkg_dependencies $extra_pkg_dependencies"
fi fi
#================================================= #=================================================

View file

@ -89,7 +89,9 @@ ynh_add_nginx_config
# UPGRADE PHP7.3 # 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 if [ "$(ynh_app_setting_get --app=$app --key=php_version)" != "7.3" ]; then
ynh_print_info --message="Upgrading PHP7.3..." ynh_print_info --message="Upgrading PHP7.3..."
ynh_remove_fpm_config ynh_remove_fpm_config
@ -97,8 +99,6 @@ if [ "$(lsb_release --codename --short)" = "stretch" ]; then
ynh_remove_php ynh_remove_php
ynh_install_php --phpversion="7.3" --package="$extra_pkg_dependencies" ynh_install_php --phpversion="7.3" --package="$extra_pkg_dependencies"
fi fi
else
pkg_dependencies="$pkg_dependencies $extra_pkg_dependencies"
fi fi
#================================================= #=================================================