From ce4a591cc126346eb11afd127001109de12cf9f2 Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Thu, 8 Mar 2018 18:33:25 +0100 Subject: [PATCH 1/2] Fix stretch --- scripts/install | 2 +- scripts/restore | 2 +- scripts/upgrade | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 057a26d..4d865d4 100644 --- a/scripts/install +++ b/scripts/install @@ -62,7 +62,7 @@ ynh_app_setting_set "$app" is_public "$is_public" # INSTALL DEPENDENCIES #================================================= -ynh_install_app_dependencies php5-gd +ynh_install_app_dependencies php5-gd php5-zip #================================================= # CREATE A MYSQL DATABASE diff --git a/scripts/restore b/scripts/restore index f7be894..12bde32 100644 --- a/scripts/restore +++ b/scripts/restore @@ -55,7 +55,7 @@ test ! -d $final_path \ #================================================= # Define and install dependencies -ynh_install_app_dependencies php5-gd +ynh_install_app_dependencies php5-gd php5-zip #================================================= # RESTORE THE NGINX CONFIGURATION diff --git a/scripts/upgrade b/scripts/upgrade index 33ced7a..786de4a 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -116,6 +116,12 @@ ynh_system_user_create "$app" # Create a dedicated php-fpm config ynh_add_fpm_config +#================================================= +# INSTALL DEPENDENCIES +#================================================= + +ynh_install_app_dependencies php5-gd php5-zip + #================================================= # SPECIFIC UPGRADE #================================================= From c6eabcb065e408e09d0564f50a450ead6c10bb93 Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Fri, 13 Apr 2018 17:37:55 +0200 Subject: [PATCH 2/2] Add php-zip if not jessie --- scripts/install | 6 +++++- scripts/restore | 6 +++++- scripts/upgrade | 6 +++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index 4d865d4..48fe1ec 100644 --- a/scripts/install +++ b/scripts/install @@ -62,7 +62,11 @@ ynh_app_setting_set "$app" is_public "$is_public" # INSTALL DEPENDENCIES #================================================= -ynh_install_app_dependencies php5-gd php5-zip +pkg_dependencies=php5-gd +if [ "$(lsb_release --codename --short)" != "jessie" ]; then + pkg_dependencies="$pkg_dependencies php-zip" +fi +ynh_install_app_dependencies $pkg_dependencies #================================================= # CREATE A MYSQL DATABASE diff --git a/scripts/restore b/scripts/restore index 12bde32..0dc2c8d 100644 --- a/scripts/restore +++ b/scripts/restore @@ -55,7 +55,11 @@ test ! -d $final_path \ #================================================= # Define and install dependencies -ynh_install_app_dependencies php5-gd php5-zip +pkg_dependencies=php5-gd +if [ "$(lsb_release --codename --short)" != "jessie" ]; then + pkg_dependencies="$pkg_dependencies php-zip" +fi +ynh_install_app_dependencies $pkg_dependencies #================================================= # RESTORE THE NGINX CONFIGURATION diff --git a/scripts/upgrade b/scripts/upgrade index 786de4a..2b7d23a 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -120,7 +120,11 @@ ynh_add_fpm_config # INSTALL DEPENDENCIES #================================================= -ynh_install_app_dependencies php5-gd php5-zip +pkg_dependencies=php5-gd +if [ "$(lsb_release --codename --short)" != "jessie" ]; then + pkg_dependencies="$pkg_dependencies php-zip" +fi +ynh_install_app_dependencies $pkg_dependencies #================================================= # SPECIFIC UPGRADE