From 1e45d98f71ce0d06a727dca1fadb82ad8d3fccb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Mon, 2 May 2022 22:38:03 +0200
Subject: [PATCH] Testing (#44)

* 2.0.14 (#24)

* 2.0.14

* Update install

* Upgrade to 2.0.15 (#26)

* Upgrade to 2.0.15

* Update README.md

* Upgrade to 2.0.16

* [autopatch] Update issue and PR templates

* Attempt to fix the stupid encoding issue in LICENSE, breaking the linter

* Add php7.3-zip

* cleaning (#32)

* Update install

* Update restore

* fix linter

* 2.0.17 (#36)

* 2.0.17

* Fix

* 2.0.19 (#38)

* 2.0.19

* 2.0.21 (#40)

* 2.0.21

* Auto-update README

Co-authored-by: yunohost-bot <yunohost@yunohost.org>

* 2.0.23

* Auto-update README

* 2.1.0

* Auto-update README

* Update _common.sh

* 2.1.1

* Auto-update README

* Update _common.sh

* Create updater.sh

* Update updater.sh

* Add change_url

* Update check_process

* Update upgrade

* Update manifest.json

* Auto-update README

Co-authored-by: Yunohost-Bot <>
Co-authored-by: Alexandre Aubin <alex.aubin@mailoo.org>
Co-authored-by: yunohost-bot <yunohost@yunohost.org>
---
 README.md       |  2 +-
 README_fr.md    |  2 +-
 manifest.json   |  2 +-
 scripts/upgrade | 12 +++++++++++-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index b4fe3fb..f910680 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ Webtrees allows you to view and edit your genealogy on your website. It has full
 **Note:** Its better to upgrade from the Webtrees admin panel when new version arrives.
 
 
-**Shipped version:** 2.1.1~ynh1
+**Shipped version:** 2.1.1~ynh2
 
 **Demo:** https://dev.webtrees.net/demo-stable/index.php?route=%2Fdemo-stable%2Ftree%2Fdemo
 
diff --git a/README_fr.md b/README_fr.md
index f1ea52d..024f0d6 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -19,7 +19,7 @@ Webtrees allows you to view and edit your genealogy on your website. It has full
 **Note:** Its better to upgrade from the Webtrees admin panel when new version arrives.
 
 
-**Version incluse :** 2.1.1~ynh1
+**Version incluse :** 2.1.1~ynh2
 
 **Démo :** https://dev.webtrees.net/demo-stable/index.php?route=%2Fdemo-stable%2Ftree%2Fdemo
 
diff --git a/manifest.json b/manifest.json
index be9d685..ba82343 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Web-based genealogy application",
         "fr": "Logiciel libre de généalogie en ligne"
     },
-    "version":"2.1.1~ynh1",
+    "version":"2.1.1~ynh2",
     "url": "https://www.webtrees.net",
     "upstream": {
         "license": "GPL-3.0-or-later",
diff --git a/scripts/upgrade b/scripts/upgrade
index 6e699af..7ecc61e 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -84,8 +84,18 @@ ynh_script_progression --message="Upgrading source files..."
 
 if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
+	ynh_script_progression --message="Upgrading source files..."
+	# Move old app dir
+	mv ${final_path} ${final_path}.old
+
 	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source "$final_path" --keep="$final_path/data"
+	ynh_setup_source "$final_path"
+
+	# restore data
+	cp -a ${final_path}.old/data ${final_path}
+
+	# delete temp directory
+	ynh_secure_remove --file=${final_path}.old
 fi
 
 chmod 750 "$final_path"