From 8d36a674403d19015a5a7563affab7b1c0aa72ba Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Mon, 15 Mar 2021 10:53:46 +0100
Subject: [PATCH] Cleaning up

---
 README.md       |  2 +-
 README_fr.md    |  2 +-
 manifest.json   | 20 ++------------------
 scripts/install |  1 -
 scripts/upgrade | 17 +++++++----------
 5 files changed, 11 insertions(+), 31 deletions(-)

diff --git a/README.md b/README.md
index 8414f26..b898cf5 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ How to configure this app: by an admin panel, a plain file with SSH.
 ## Documentation
 
 * Official documentation: https://jupyterlab.readthedocs.io/en/stable/
-* YunoHost documentation: https://yunohost.org/#/app_jupyterlab
+* YunoHost documentation: https://yunohost.org/en/app_jupyterlab
 
 ## YunoHost specific features
 
diff --git a/README_fr.md b/README_fr.md
index 7252259..755ca1e 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -28,7 +28,7 @@ Comment configurer cette application : via le panneau d'administration, un fichi
 ## Documentation
 
 * Documentation officielle : https://jupyterlab.readthedocs.io/en/stable/
-* Documentation YunoHost : https://yunohost.org/#/app_jupyterlab_fr
+* Documentation YunoHost : https://yunohost.org/fr/app_jupyterlab
 
 ## Caractéristiques spécifiques YunoHost
 
diff --git a/manifest.json b/manifest.json
index 3f34559..1c75ea0 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Code console environment for running Python code interactively.",
         "fr": "Console de code pour exécuter du code Python de manière interactive."
     },
-    "version": "3.0.10~ynh1",
+    "version": "3.0.10~ynh2",
     "url": "https://jupyterlab.readthedocs.io/en/stable/",
     "license": "BSD-3-Clause",
     "maintainer": {
@@ -14,7 +14,7 @@
         "email": "pierre@kayou.io"
     },
     "requirements": {
-        "yunohost": ">= 3.8.1"
+        "yunohost": ">= 4.1.7"
     },
     "multi_instance": true,
     "services": [
@@ -25,38 +25,22 @@
             {
                 "name": "domain",
                 "type": "domain",
-                "ask": {
-                    "en": "Choose a domain name for JupyterLab",
-                    "fr": "Choisissez un nom de domaine pour JupyterLab"
-                },
                 "example": "example.com"
             },
             {
                 "name": "path",
                 "type": "path",
-                "ask": {
-                    "en": "Choose a path for JupyterLab",
-                    "fr": "Choisissez un chemin pour JupyterLab"
-                },
                 "example": "/jupyterlab",
                 "default": "/jupyterlab"
             },
             {
                 "name": "admin",
                 "type": "user",
-                "ask": {
-                    "en": "Choose an admin user",
-                    "fr": "Choisissez l’administrateur"
-                },
                 "example": "johndoe"
             },
             {
                 "name": "is_public",
                 "type": "boolean",
-                "ask": {
-                    "en": "Is it a public application?",
-                    "fr": "Est-ce une application publique ?"
-                },
                 "default": true
             },
             {
diff --git a/scripts/install b/scripts/install
index 2065d27..7838a6b 100644
--- a/scripts/install
+++ b/scripts/install
@@ -50,7 +50,6 @@ ynh_script_progression --message="Storing installation settings..." --weight=1
 ynh_app_setting_set --app=$app --key=domain --value=$domain
 ynh_app_setting_set --app=$app --key=path --value=$path_url
 ynh_app_setting_set --app=$app --key=admin --value=$admin
-ynh_app_setting_set --app=$app --key=is_public --value=$is_public
 ynh_app_setting_set --app=$app --key=enable_terminal --value=$enable_terminal
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 52fecd4..3039fde 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -19,7 +19,6 @@ app=$YNH_APP_INSTANCE_NAME
 domain=$(ynh_app_setting_get --app=$app --key=domain)
 path_url=$(ynh_app_setting_get --app=$app --key=path)
 admin=$(ynh_app_setting_get --app=$app --key=admin)
-is_public=$(ynh_app_setting_get --app=$app --key=is_public)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 port=$(ynh_app_setting_get --app=$app --key=port)
 port_hub=$(ynh_app_setting_get --app=$app --key=port_hub)
@@ -37,15 +36,6 @@ upgrade_type=$(ynh_check_app_version_changed)
 #=================================================
 ynh_script_progression --message="Ensuring downward compatibility..."
 
-# Fix is_public as a boolean value
-if [ "$is_public" = "Yes" ]; then
-	ynh_app_setting_set --app=$app --key=is_public --value=1
-	is_public=1
-elif [ "$is_public" = "No" ]; then
-	ynh_app_setting_set --app=$app --key=is_public --value=0
-	is_public=0
-fi
-
 # If final_path doesn't exist, create it
 if [ -z "$final_path" ]; then
 	final_path=/opt/$app
@@ -55,6 +45,13 @@ if [ -z "$final_path" ]; then
 	ynh_app_setting_set --app=$app --key=final_path --value=$final_path
 fi
 
+# Cleaning legacy permissions
+if ynh_legacy_permissions_exists; then
+	ynh_legacy_permissions_delete_all
+
+	ynh_app_setting_delete --app=$app --key=is_public
+fi
+
 #=================================================
 # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
 #=================================================