From a61753459f0610a827ee4ceb04c898173e07bc01 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 28 Jun 2021 08:47:54 +0200 Subject: [PATCH] FIX --- manifest.json | 7 +++---- scripts/_common.sh | 1 - scripts/install | 2 +- scripts/remove | 16 +--------------- 4 files changed, 5 insertions(+), 21 deletions(-) diff --git a/manifest.json b/manifest.json index 93b9461..0ee46de 100644 --- a/manifest.json +++ b/manifest.json @@ -3,8 +3,8 @@ "id": "opennote", "packaging_format": 1, "description": { - "en": "Alternative to Microsoft OneNote and EverNote.", - "fr": "Alternative web à Microsoft OneNote and EverNote." + "en": "web based text editor/note taking software", + "fr": "Éditeur WEB de texte/logiciel de prise de notes" }, "version": "18.03.00~ynh1", "url": "https://foxusa.github.io/OpenNote/OpenNote/", @@ -17,8 +17,7 @@ "license": "MIT", "maintainer": { "name": "Alex", - "email": "apulido@free.fr", - "url": "https://github.com/Yunohost-Apps/OpenNote_ynh" + "email": "apulido@free.fr" }, "requirements": { "yunohost": ">> 4.2.4" diff --git a/scripts/_common.sh b/scripts/_common.sh index c7189cd..8755d64 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,6 @@ # COMMON VARIABLES #================================================= -YNH_PHP_VERSION="7.3" #================================================= # PERSONAL HELPERS diff --git a/scripts/install b/scripts/install index a586229..b1a64a5 100644 --- a/scripts/install +++ b/scripts/install @@ -77,7 +77,7 @@ chown -R $app:www-data "$final_path" #================================================= ynh_script_progression --message="Configuring NGINX web server..." --weight=1 -# Create a dedicated nginx config +# Create a dedicated NGINX config ynh_add_nginx_config #================================================= diff --git a/scripts/remove b/scripts/remove index af51692..aa0230a 100644 --- a/scripts/remove +++ b/scripts/remove @@ -17,22 +17,8 @@ ynh_script_progression --message="Loading installation settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) -port=$(ynh_app_setting_get --app=$app --key=port) final_path=$(ynh_app_setting_get --app=$app --key=final_path) -#================================================= -# STANDARD REMOVE -#================================================= -# REMOVE SERVICE INTEGRATION IN YUNOHOST -#================================================= - -# Remove the service from the list of services known by Yunohost (added from `yunohost service add`) -if ynh_exec_warn_less yunohost service status $app >/dev/null -then - ynh_script_progression --message="Removing $app service integration..." --weight=2 - yunohost service remove $app -fi - #================================================= # REMOVE APP MAIN DIR #================================================= @@ -44,7 +30,7 @@ ynh_secure_remove --file="$final_path" #================================================= # REMOVE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Removing nginx web server configuration..." --weight=1 +ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1 # Remove the dedicated nginx config ynh_remove_nginx_config