From d671fab23547a1fbe66932c69f3ae39c3373cbab Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sun, 7 Mar 2021 20:55:20 +0100
Subject: [PATCH] Cleaning up

---
 README.md       | 2 +-
 README_fr.md    | 2 +-
 manifest.json   | 2 +-
 scripts/install | 3 +--
 scripts/upgrade | 8 +++++++-
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index d2bcaf6..58291e0 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ Bludit is a web application to build your own website or blog in seconds; it's c
 ## Documentation
 
  * Official documentation: https://docs.bludit.com/en/
- * YunoHost documentation: https://yunohost.org/#/app_bludit
+ * YunoHost documentation: https://yunohost.org/en/app_bludit
 
 ## YunoHost specific features
 
diff --git a/README_fr.md b/README_fr.md
index 3a29392..6537962 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -27,7 +27,7 @@ Bludit est une application Web pour créer votre propre site Web ou blog en quel
 ## Documentation
 
 * Documentation officielle : https://docs.bludit.com/en/
-* Documentation YunoHost : https://yunohost.org/#/app_bludit_fr
+* Documentation YunoHost : https://yunohost.org/fr/app_bludit
 
 ## Caractéristiques spécifiques YunoHost
 
diff --git a/manifest.json b/manifest.json
index 6b12291..267f18f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -14,7 +14,7 @@
     "email": ""
   },
   "requirements": {
-    "yunohost": ">= 4.0.0"
+    "yunohost": ">= 4.1.7"
   },
   "multi_instance": true,
   "services": [
diff --git a/scripts/install b/scripts/install
index c915d6e..6893f55 100644
--- a/scripts/install
+++ b/scripts/install
@@ -44,7 +44,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=is_public --value=$is_public
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
@@ -90,7 +89,7 @@ chown -R $app: $final_path
 #=================================================
 # SETUP SSOWAT
 #=================================================
-ynh_script_progression --message="Configuring SSOwat..." --weight=1
+ynh_script_progression --message="Configuring permissions..." --weight=1
 
 # Make app public if necessary or protect it
 if [ $is_public -eq 1 ]
diff --git a/scripts/upgrade b/scripts/upgrade
index 7ebb002..d3ea5fc 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)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
-is_public=$(ynh_app_setting_get --app=$app --key=is_public)
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================
@@ -39,6 +38,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
 #=================================================