From 722fe49651651ad97c2923f0f3214f83fae92de2 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Wed, 3 Mar 2021 13:23:09 +0100
Subject: [PATCH] Upgrade to version 4.2.0

---
 README.md       | 2 +-
 README_fr.md    | 2 +-
 conf/app.src    | 6 +++---
 manifest.json   | 2 +-
 scripts/install | 1 -
 scripts/upgrade | 3 +--
 6 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 51bd72d..a8108fc 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 ## Overview
 CryptPad is a collaborative encrypted document editor in real time. It is a privacy-friendly alternative to popular office tools and cloud services. All content stored in CryptPad is encrypted before being sent, which means that no one can access your data unless you give them the keys. You can share access to a document simply by sharing the link.
 
-**Shipped version:** 4.1.0
+**Shipped version:** 4.2.0
 
 ## Screenshots
 
diff --git a/README_fr.md b/README_fr.md
index 2e7b69c..5ad1d2e 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install
 ## Vue d'ensemble
 CryptPad est un éditeur de documents chiffrés collaboratifs en temps réel. C'est une alternative respectant la vie privée aux outils office et aux services cloud populaires. Tout le contenu stocké dans CryptPad est chiffré avant d'être envoyé, ce qui signifie que personne ne peut accéder à vos données à moins que vous ne leur donniez les clés. Vous pouvez partager l'accès à un document simplement en partageant le lien.
 
-**Version incluse :** 4.1.0
+**Version incluse :** 4.2.0
 
 ## Captures d'écran
 
diff --git a/conf/app.src b/conf/app.src
index 25dbb8d..29a88b7 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,6 +1,6 @@
-SOURCE_URL=https://github.com/xwiki-labs/cryptpad/archive/4.1.0.tar.gz
-SOURCE_SUM=1b5ad7536532e504108bbdceb9c53c8ae116a7cd74185d9cbad0ee7929d423e2
+SOURCE_URL=https://github.com/xwiki-labs/cryptpad/archive/4.2.0.tar.gz
+SOURCE_SUM=6ff68e65d7222890ab5f0ca144d916ba8f9db90363efa3aed6abeac8624715ce
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=cryptpad-4.1.0.tar.gz
+SOURCE_FILENAME=cryptpad-4.2.0.tar.gz
diff --git a/manifest.json b/manifest.json
index af83e5a..c1769d7 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Zero Knowledge realtime collaborative editor",
         "fr": "Éditeur chiffré collaboratif en temps réel."
     },
-    "version": "4.1.0~ynh1",
+    "version": "4.2.0~ynh1",
     "url": "https://cryptpad.fr/",
     "license": "AGPL-3.0-only",
     "maintainer": {
diff --git a/scripts/install b/scripts/install
index 26e475b..d127c50 100644
--- a/scripts/install
+++ b/scripts/install
@@ -46,7 +46,6 @@ ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url
 #=================================================
 
 ynh_app_setting_set --app=$app --key=domain --value=$domain
-ynh_app_setting_set --app=$app --key=is_public --value=$is_public
 ynh_app_setting_set --app=$app --key=path_url --value=$path_url
 ynh_app_setting_set --app=$app --key=admin --value=$admin
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 72813a0..1c94382 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_url)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
-is_public=$(ynh_app_setting_get --app=$app --key=is_public)
 admin=$(ynh_app_setting_get --app=$app --key=admin)
 email=$(ynh_user_get_info --username=$admin --key=mail)
 port=$(ynh_app_setting_get --app=$app --key=port)
@@ -175,7 +174,7 @@ yunohost service add $app --description="Zero Knowledge realtime collaborative e
 #=================================================
 ynh_script_progression --message="Starting a systemd service..." --weight=1
 
-ynh_systemd_action --service_name=$app --action=start --log_path="systemd" --line_match="server available"
+ynh_systemd_action --service_name=$app --action=start --log_path=systemd --line_match="server available"
 
 #=================================================
 # RELOAD NGINX