From 33982a4d66fd8999f6b8535396bdae58eb050ac5 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Fri, 2 Jul 2021 15:29:02 +0200
Subject: [PATCH] Add templates

---
 check_process                     |   5 ++---
 doc/DISCLAIMER.md                 |   0
 {img => doc/screenshots}/home.png | Bin
 {img => doc/screenshots}/menu.png | Bin
 manifest.json                     |   9 ++++++++-
 scripts/change_url                |   2 +-
 scripts/upgrade                   |  12 ++++++------
 7 files changed, 17 insertions(+), 11 deletions(-)
 create mode 100644 doc/DISCLAIMER.md
 rename {img => doc/screenshots}/home.png (100%)
 rename {img => doc/screenshots}/menu.png (100%)

diff --git a/check_process b/check_process
index 10ea98e..ad000b6 100644
--- a/check_process
+++ b/check_process
@@ -1,8 +1,8 @@
 ;; Test complet
 	; Manifest
-		domain="domain.tld"	(DOMAIN)
+		domain="domain.tld"
 		etherpad_instance="https://annuel2.framapad.org"
-		is_public=1	(PUBLIC|public=1|private=0)
+		is_public=1
 		creation_open=1
 	; Checks
 		pkg_linter=1
@@ -14,7 +14,6 @@
 		upgrade=1
 		backup_restore=1
 		multi_instance=1
-		port_already_use=0
 		change_url=1
 ;;; Options
 Email=ljf+libreto_ynh@reflexlibre.net
diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md
new file mode 100644
index 0000000..e69de29
diff --git a/img/home.png b/doc/screenshots/home.png
similarity index 100%
rename from img/home.png
rename to doc/screenshots/home.png
diff --git a/img/menu.png b/doc/screenshots/menu.png
similarity index 100%
rename from img/menu.png
rename to doc/screenshots/menu.png
diff --git a/manifest.json b/manifest.json
index a0b8080..763834c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -8,6 +8,13 @@
     },
     "version": "0.0.20180605~ynh2",
     "url": "https://libreto.net",
+    "upstream": {
+        "license": "GPL-3.0-or-later",
+        "website": "https://libreto.net",
+        "demo": "https://libreto.net",
+        "admindoc": "https://github.com/Ventricule/libreto",
+        "code": "https://github.com/Ventricule/libreto"
+    },
     "license": "GPL-3.0-or-later",
     "maintainer": {
         "name": "ljf",
@@ -15,7 +22,7 @@
         "url": "https://reflexlibre.net"
     },
     "requirements": {
-        "yunohost": ">= 4.1.7"
+        "yunohost": ">= 4.2.0"
     },
     "multi_instance": true,
     "services": [
diff --git a/scripts/change_url b/scripts/change_url
index 7a109a9..021c6a7 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -27,7 +27,7 @@ app=$YNH_APP_INSTANCE_NAME
 ynh_script_progression --message="Loading installation settings..." --weight=1
 
 # Needed for helper "ynh_add_nginx_config"
-final_path=$(ynh_app_setting_get $app final_path)
+final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 
 #=================================================
 # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
diff --git a/scripts/upgrade b/scripts/upgrade
index ca08087..a46f4f7 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -15,12 +15,12 @@ source /usr/share/yunohost/helpers
 
 app=$YNH_APP_INSTANCE_NAME
 
-domain=$(ynh_app_setting_get $app domain)
-path_url=$(ynh_app_setting_get $app path)
-is_public=$(ynh_app_setting_get $app is_public)
-final_path=$(ynh_app_setting_get $app final_path)
-etherpad_instance=$(ynh_app_setting_get $app etherpad_instance)
-creation_open=$(ynh_app_setting_get $app creation_open)
+domain=$(ynh_app_setting_get --app=$app --key=domain)
+path_url=$(ynh_app_setting_get --app=$app --key=path)
+is_public=$(ynh_app_setting_get --app=$app --key=is_public)
+final_path=$(ynh_app_setting_get --app=$app --key=final_path)
+etherpad_instance=$(ynh_app_setting_get --app=$app --key=etherpad_instance)
+creation_open=$(ynh_app_setting_get --app=$app --key=creation_open)
 
 #=================================================
 # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP