From a8e3a8006feb6e52ef09bf7d1753747059889ddd Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Fri, 26 Feb 2021 09:06:40 +0100
Subject: [PATCH] Fix

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

diff --git a/README.md b/README.md
index 8c5a4d0..cac9539 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ You can access Etherpad's admin panel at `domain.tld/admin`. The configuration f
 
 ## Documentation
 
- * Official documentation: http://etherpad.org/doc/v1.8.8
+ * Official documentation: http://etherpad.org/doc/v1.8.10
  * YunoHost documentation: https://yunohost.org/#/app_etherpad
 
 ## YunoHost specific features
diff --git a/README_fr.md b/README_fr.md
index ca76076..5ce9dbd 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -32,7 +32,7 @@ Vous pouvez accéder au panneau d'administration d'Etherpad à l'adresse `domain
 
 ## Documentation
 
- * Documentation officielle : http://etherpad.org/doc/v1.8.8
+ * Documentation officielle : http://etherpad.org/doc/v1.8.10
  * Documentation YunoHost : https://yunohost.org/#/app_etherpad
 
 ## Fonctionnalités spécifiques à YunoHost
diff --git a/manifest.json b/manifest.json
index 0df64ef..594d1ff 100644
--- a/manifest.json
+++ b/manifest.json
@@ -13,7 +13,7 @@
         "name": "eric_G"
     },
     "requirements": {
-        "yunohost": ">= 4.1.3"
+        "yunohost": ">= 4.1.7"
     },
     "multi_instance": true,
     "services": [
diff --git a/scripts/change_url b/scripts/change_url
index dc86cc3..c473434 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -70,7 +70,7 @@ fi
 #=================================================
 ynh_script_progression --message="Stopping a systemd service..." --weight=2
 
-ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd"
+ynh_systemd_action --service_name=$app --action=stop --log_path=systemd
 
 #=================================================
 # MODIFY URL IN NGINX CONF
diff --git a/scripts/install b/scripts/install
index 795b560..524ec78 100644
--- a/scripts/install
+++ b/scripts/install
@@ -128,10 +128,9 @@ popd || ynh_die
 ynh_script_progression --message="Configuring Etherpad..." --weight=60
 
 ynh_add_config --template="../conf/settings.json" --destination="$final_path/settings.json"
-ynh_add_config --template="../conf/credentials.json" --destination="$final_path/credentials.json"
+nh_store_file_checksum --file="$final_path/settings.json"
 
-# Calculate and store the config file checksum into the app settings
-ynh_store_file_checksum --file="$final_path/settings.json"
+ynh_add_config --template="../conf/credentials.json" --destination="$final_path/credentials.json"
 ynh_store_file_checksum --file="$final_path/credentials.json"
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 490deb9..6163872 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -127,8 +127,13 @@ ynh_system_user_create --username=$app
 #=================================================
 ynh_script_progression --message="Reconfiguring Etherpad..." --weight=6
 
+ynh_backup_if_checksum_is_different --file="$final_path/settings.json"
 ynh_add_config --template="../conf/settings.json" --destination="$final_path/settings.json"
+ynh_store_file_checksum --file="$final_path/settings.json"
+
+ynh_backup_if_checksum_is_different --file="$final_path/credentials.json"
 ynh_add_config --template="../conf/credentials.json" --destination="$final_path/credentials.json"
+ynh_store_file_checksum --file="$final_path/credentials.json"
 
 #=================================================
 # INSTALL ETHERPAD