From 7c637235d9ca85c15659e942909d9cecdb705087 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 31 Dec 2020 16:18:51 +0100 Subject: [PATCH] Remove service --- README.md | 2 +- README_fr.md | 2 +- manifest.json | 2 +- scripts/install | 7 ------- scripts/remove | 11 ----------- scripts/restore | 7 ------- scripts/upgrade | 7 ------- 7 files changed, 3 insertions(+), 35 deletions(-) diff --git a/README.md b/README.md index 6c92ad4..87e00c8 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Lionwiki-t2t for YunoHost [![Integration level](https://dash.yunohost.org/integration/lionwiki-t2t.svg)](https://dash.yunohost.org/appci/app/lionwiki-t2t) ![](https://ci-apps.yunohost.org/ci/badges/lionwiki-t2t.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/lionwiki-t2t.maintain.svg) -[![Install Lionwiki-t2t with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=lionwiki-t2t) +[![Install Lionwiki-t2t with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=lionwiki-t2t) *[Lire ce readme en français.](./README_fr.md)* diff --git a/README_fr.md b/README_fr.md index 082f492..2e1844f 100755 --- a/README_fr.md +++ b/README_fr.md @@ -1,7 +1,7 @@ # Lionwiki-t2t pour YunoHost [![Niveau d'intégration](https://dash.yunohost.org/integration/lionwiki-t2t.svg)](https://dash.yunohost.org/appci/app/lionwiki-t2t) ![](https://ci-apps.yunohost.org/ci/badges/lionwiki-t2t.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/lionwiki-t2t.maintain.svg) -[![Installer Lionwiki-t2t avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=lionwiki-t2t) +[![Installer Lionwiki-t2t avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=lionwiki-t2t) *[Read this readme in english.](./README.md)* diff --git a/manifest.json b/manifest.json index 5bce32b..92c5802 100755 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Lightweight wiki-style CMS using the txt2tags syntax", "fr": "CMS léger, géré sous forme de wiki utilisant la syntaxe txt2tags" }, - "version": "3.2.11b~ynh5", + "version": "3.2.11b~ynh6", "url": "https://lionwiki-t2t.sourceforge.io/", "license": "MIT", "maintainer": { diff --git a/scripts/install b/scripts/install index c35358a..ec74ab8 100755 --- a/scripts/install +++ b/scripts/install @@ -200,13 +200,6 @@ find $final_path/templates/minimaxing/minimaxing.css -type f -print0 | xargs -0 # chmod : -rwxr-xr-x 1 root root 241 May 3 08:36 index.html => BAD # find : -rw-r--r-- 1 1001 1002 241 May 3 08:36 index.html => GOOD -#================================================= -# ADVERTISE SERVICE IN ADMIN PANEL -#================================================= -ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 - -yunohost service add $app --description "Lightweight wiki-style CMS" --log "/var/log/$app/$app.log" - #================================================= # SETUP SSOWAT #================================================= diff --git a/scripts/remove b/scripts/remove index 9a4a388..0fb22ef 100755 --- a/scripts/remove +++ b/scripts/remove @@ -22,17 +22,6 @@ 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=1 - yunohost service remove $app -fi - #================================================= # REMOVE APP MAIN DIR #================================================= diff --git a/scripts/restore b/scripts/restore index 8be1abb..7640926 100755 --- a/scripts/restore +++ b/scripts/restore @@ -90,13 +90,6 @@ ynh_script_progression --message="Reinstalling dependencies..." --weight=4 # Define and install dependencies ynh_install_app_dependencies $pkg_dependencies -#================================================= -# INTEGRATE SERVICE IN YUNOHOST -#================================================= -ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 - -yunohost service add $app --description "Lightweight wiki-style CMS" --log "/var/log/$app/$app.log" - #================================================= # GENERIC FINALIZATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index fe23048..73b3273 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -128,13 +128,6 @@ ynh_store_file_checksum --file="$final_path/menu.php" # Set permissions on app files chown -R root: $final_path -#================================================= -# ADVERTISE SERVICE IN ADMIN PANEL -#================================================= -ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 - -yunohost service add $app --description "Lightweight wiki-style CMS" --log "/var/log/$app/$app.log" - #================================================= # RELOAD NGINX #=================================================