From 7a640eebe4cd697cbf7ef4fa963c442d205719e7 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Holcroft Date: Mon, 3 Sep 2018 21:35:41 +0200 Subject: [PATCH] Fix installation (php-zip was missing) --- manifest.json | 6 +++--- scripts/install | 6 ++++++ scripts/remove | 7 +++++++ scripts/restore | 6 ++++++ scripts/upgrade | 6 ++++++ 5 files changed, 28 insertions(+), 3 deletions(-) diff --git a/manifest.json b/manifest.json index 9e33393..01f2df8 100644 --- a/manifest.json +++ b/manifest.json @@ -6,15 +6,15 @@ "en": "Grav - Grav is a modern open source flat-file CMS", "fr": "Grav - Grav is a modern open source flat-file CMS" }, - "version": "1.3.1", + "version": "1.3.1~ynh1", "url": "https://www.getgrav.org/", - "license": "free", + "license": "MIT-0", "maintainer": { "name": "cyp, lithrel", "email": "cyp@rouquin.me, lithrel@randomdomainname.net" }, "requirements": { - "yunohost": ">> 2.4.0" + "yunohost": ">= 3.1.0" }, "multi_instance": true, "services": [ diff --git a/scripts/install b/scripts/install index 620b11b..7635424 100644 --- a/scripts/install +++ b/scripts/install @@ -41,6 +41,12 @@ ynh_app_setting_set $app language $language sudo mkdir "$final_path" ynh_app_setting_set $app final_path $final_path +#================================================= +# INSTALL DEPENDENCIES +#================================================= + +ynh_install_app_dependencies php-zip + # Get source SETUP_SOURCE diff --git a/scripts/remove b/scripts/remove index a62ac0c..4e03881 100644 --- a/scripts/remove +++ b/scripts/remove @@ -14,6 +14,13 @@ app=$YNH_APP_INSTANCE_NAME # Retrieve app settings domain=$(ynh_app_setting_get "$app" domain) +#================================================= +# REMOVE DEPENDENCIES +#================================================= + +# Remove metapackage and its dependencies +ynh_remove_app_dependencies + # Delete app directory and configurations SECURE_REMOVE '/var/www/$app' # Delete directory application sudo rm -f "/etc/php5/fpm/pool.d/${app}.conf" diff --git a/scripts/restore b/scripts/restore index 3070e9b..3c8cd12 100644 --- a/scripts/restore +++ b/scripts/restore @@ -42,6 +42,12 @@ if [ -f "${phpfpm_ini}" ]; then ynh_die "The PHP FPM INI configuration already exists at '${phpfpm_ini}'. You should safely delete it before restoring this app." fi +#================================================= +# INSTALL DEPENDENCIES +#================================================= + +ynh_install_app_dependencies php-zip + # Restore sources & data sudo cp -a ./sources "${final_path}" diff --git a/scripts/upgrade b/scripts/upgrade index 6aadad5..495dd00 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -18,6 +18,12 @@ language=$(ynh_app_setting_get "$app" language) CHECK_PATH # Checks and corrects the syntax of the path. +#================================================= +# INSTALL DEPENDENCIES +#================================================= + +ynh_install_app_dependencies php-zip + final_path=/var/www/$app # Get source