From 1b43bc57235c9ecf97f76f41ccf9b02677a0788f Mon Sep 17 00:00:00 2001
From: Mateusz <2871798+orhtej2@users.noreply.github.com>
Date: Fri, 9 Feb 2024 15:40:06 +0100
Subject: [PATCH 1/6] Add test for upgrade from 1.1.10.

---
 tests.toml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests.toml b/tests.toml
index 929a36c..9881b4d 100644
--- a/tests.toml
+++ b/tests.toml
@@ -9,3 +9,5 @@ test_format = 1.0
     # ------------
 
     exclude = ["install.subdir", "install.nourl"]
+
+    test_upgrade_from.c98a6fb2.name = "Upgrade from 1.1.10"

From 90b59212bd4c8330395150b3608972c71818b306 Mon Sep 17 00:00:00 2001
From: Florent <florent.git@zeteo.me>
Date: Sat, 17 Feb 2024 15:26:22 +0100
Subject: [PATCH 2/6] Fix upgrade #24

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

diff --git a/scripts/upgrade b/scripts/upgrade
index 150a5e6..53df1f7 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -42,7 +42,7 @@ then
 	ynh_script_progression --message="Upgrading source files..." --weight=20
 
 	# Download, check integrity, uncompress and patch the source from manifest.toml
-	ynh_setup_source --dest_dir="$install_dir"
+	ynh_setup_source --dest_dir="$install_dir" --full_replace=1
 fi
 
 chown -R $app:www-data "$install_dir"

From 05f978bf0e783e090a997bb509b4a68d019e690a Mon Sep 17 00:00:00 2001
From: Florent <florent.git@zeteo.me>
Date: Sat, 17 Feb 2024 15:26:53 +0100
Subject: [PATCH 3/6] Remove unused variable

---
 scripts/_common.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 2a81026..0271916 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -5,7 +5,6 @@
 #=================================================
 
 nodejs_version=18
-main_domain=$(cat /etc/yunohost/current_host)
 
 #=================================================
 # PERSONAL HELPERS

From 70493ea7d9ffd8ce53eeddad33e4934fbadc250a Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Sat, 17 Feb 2024 14:27:50 +0000
Subject: [PATCH 4/6] Auto-update README

---
 README.md    | 4 ++--
 README_fr.md | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 3e8b141..87791bb 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 <!--
-N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
+N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/readme_generator
 It shall NOT be edited by hand.
 -->
 
@@ -61,4 +61,4 @@ or
 sudo yunohost app upgrade grist -u https://github.com/YunoHost-Apps/grist_ynh/tree/testing --debug
 ```
 
-**More info regarding app packaging:** <https://yunohost.org/packaging_apps>
+**More info regarding app packaging:** <https://yunohost.org/packaging_apps>
\ No newline at end of file
diff --git a/README_fr.md b/README_fr.md
index 1335628..96aa521 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -1,5 +1,5 @@
 <!--
-N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
+N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/readme_generator
 It shall NOT be edited by hand.
 -->
 

From e9c458a2a9f967ad7bcbd8655002c06bff3b1d4b Mon Sep 17 00:00:00 2001
From: Florent <florent.git@zeteo.me>
Date: Sat, 17 Feb 2024 15:28:02 +0100
Subject: [PATCH 5/6] Bump version

---
 manifest.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.toml b/manifest.toml
index c8b84f9..cacdf82 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -7,7 +7,7 @@ name = "Grist"
 description.en = "Modern relational spreadsheet"
 description.fr = "Feuille de calcul relationnelle moderne"
 
-version = "1.1.11~ynh1"
+version = "1.1.11~ynh2"
 
 maintainers = ["fflorent"]
 

From 246a1182dadc7b8102be8cffe3620e7e9cf22338 Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Sat, 17 Feb 2024 14:28:49 +0000
Subject: [PATCH 6/6] Auto-update README

---
 README.md    | 2 +-
 README_fr.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 87791bb..8a5fd4b 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ More about the features can be found here: <https://github.com/gristlabs/grist-c
 - You cannot log out from Grist, you have to log out from YunoHost to do that.
 
 
-**Shipped version:** 1.1.11~ynh1
+**Shipped version:** 1.1.11~ynh2
 
 **Demo:** https://docs.getgrist.com
 
diff --git a/README_fr.md b/README_fr.md
index 96aa521..ef6b44b 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -32,7 +32,7 @@ Plus d'information sur les fonctionnalités sont disponibles ici : <https://gith
 - Vous ne pouvez pas vous déconnecter depuis Grist, pour ce faire, vous devez vous déconnecter de YunoHost.
 
 
-**Version incluse :** 1.1.11~ynh1
+**Version incluse :** 1.1.11~ynh2
 
 **Démo :** https://docs.getgrist.com