From bd34b89c2168a3f87456ffc2a1c1764391468662 Mon Sep 17 00:00:00 2001 From: Sebastian Gumprich Date: Wed, 20 Sep 2017 21:24:47 +0200 Subject: [PATCH] use package helpers --- scripts/_common.sh | 4 ++-- scripts/install | 1 - scripts/restore | 3 +-- scripts/upgrade | 3 +-- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 1c8d9f7..a1818c5 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -264,7 +264,7 @@ ynh_install_php7 () { echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" | sudo tee /etc/apt/sources.list.d/php7.list ynh_package_update - ynh_package_install php7.1 --no-install-recommends + ynh_install_app_dependencies php7.1 php7.1-zip php7.1-fpm php7.1-mysql php7.1-xml php7.1-intl php7.1-mbstring php7.1-gd php7.1-curl sudo update-alternatives --install /usr/bin/php php /usr/bin/php5 70 } @@ -272,6 +272,6 @@ ynh_remove_php7 () { sudo rm -f /etc/apt/sources.list.d/php7.list sudo apt-key del 4096R/89DF5277 sudo apt-key del 2048R/11A06851 - ynh_package_remove php7.1 php7.1-fpm php7.1-mysql php7.1-xml php7.1-intl php7.1-mbstring + ynh_remove_app_dependencies php7.1 php7.1-zip php7.1-fpm php7.1-mysql php7.1-xml php7.1-intl php7.1-mbstring php7.1-gd php7.1-curl } diff --git a/scripts/install b/scripts/install index a8ff00c..0a51012 100755 --- a/scripts/install +++ b/scripts/install @@ -70,7 +70,6 @@ ynh_app_setting_set $app language $language #================================================= ynh_install_php7 -ynh_package_install php7.1 php7.1-zip php7.1-fpm php7.1-mysql php7.1-xml php7.1-intl php7.1-mbstring php7.1-gd php7.1-curl ynh_install_nodejs 6.10.3 #================================================= diff --git a/scripts/restore b/scripts/restore index 318c488..4108d1a 100755 --- a/scripts/restore +++ b/scripts/restore @@ -76,8 +76,7 @@ ynh_system_user_create $app # REINSTALL DEPENDENCIES #================================================= -ynh_install_php7 -ynh_package_install php7.1 php7.1-zip php7.1-fpm php7.1-mysql php7.1-xml php7.1-intl php7.1-mbstring php7.1-gd php7.1-curl +ynh_install_app_dependencies php7.1 php7.1-zip php7.1-fpm php7.1-mysql php7.1-xml php7.1-intl php7.1-mbstring php7.1-gd php7.1-curl ynh_install_nodejs 6.10.3 diff --git a/scripts/upgrade b/scripts/upgrade index 6d0c13f..bb8e4b2 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -87,8 +87,7 @@ ynh_system_user_create $app #================================================= # install new dependencies -ynh_install_php7 -ynh_package_install php7.1 php7.1-zip php7.1-fpm php7.1-mysql php7.1-xml php7.1-intl php7.1-mbstring --no-install-recommends +ynh_install_app_dependencies php7.1 php7.1-zip php7.1-fpm php7.1-mysql php7.1-xml php7.1-intl php7.1-mbstring php7.1-gd php7.1-curl # create a user first_name=$(ynh_user_get_info $admin 'firstname')