From c9022c30946a62e75351e1864b0160b8110d1dc5 Mon Sep 17 00:00:00 2001
From: Yunohost-Bot <>
Date: Sun, 7 Aug 2022 20:11:17 +0200
Subject: [PATCH 1/3] =?UTF-8?q?[autopatch]=20Add=20Common=20Platform=C2=A0?=
 =?UTF-8?q?Enumeration=20id=20to=20`manifest.json`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/manifest.json b/manifest.json
index c89aa0a..a300426 100644
--- a/manifest.json
+++ b/manifest.json
@@ -13,7 +13,8 @@
         "website": "https://cryptpad.fr/",
         "demo": "https://cryptpad.fr/",
         "admindoc": "https://docs.cryptpad.fr/en/",
-        "code": "https://github.com/xwiki-labs/cryptpad"
+        "code": "https://github.com/xwiki-labs/cryptpad",
+        "cpe": "cpe:2.3:a:xwiki:cryptpad"
     },
     "license": "AGPL-3.0-only",
     "maintainer": {
@@ -53,4 +54,4 @@
             }
         ]
     }
-}
+}
\ No newline at end of file

From 467dae519f6cc1ce916e26615d2b86dacc74fbaa Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Mon, 15 Aug 2022 19:04:47 +0200
Subject: [PATCH 2/3] set relative path for --keep opt

---
 scripts/upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 7b46a12..fe89061 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -90,7 +90,7 @@ then
 	ynh_script_progression --message="Upgrading source files..." --weight=1
 
 	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$final_path" --keep="$final_path/config/config.js"
+	ynh_setup_source --dest_dir="$final_path" --keep="config/config.js"
 	
 	chmod 750 "$final_path"
 	chmod -R o-rwx "$final_path"

From 3f627932fbd3b84e3843c4782cfa126caa6d6fbd Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Mon, 15 Aug 2022 17:04:54 +0000
Subject: [PATCH 3/3] Auto-update README

---
 README.md    | 1 +
 README_fr.md | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9a5dcea..e861781 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,7 @@ CryptPad is a collaboration suite that is end-to-end-encrypted and open-source.
 
 **Shipped version:** 4.12.0~ynh2
 
+
 **Demo:** https://cryptpad.fr/
 
 ## Screenshots
diff --git a/README_fr.md b/README_fr.md
index f7532c0..facbe19 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -17,7 +17,8 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 
 CryptPad est une suite de collaboration chiffrée de bout en bout et open source. Il est conçu pour permettre la collaboration, en synchronisant les modifications apportées aux documents en temps réel. Étant donné que toutes les données sont chiffrées, le service et ses administrateurs n'ont aucun moyen de voir le contenu modifié et stocké. 
 
-**Version incluse :** 4.12.0~ynh2
+**Version incluse :** 4.12.0~ynh2
+
 
 **Démo :** https://cryptpad.fr/