From 183728c3784af6d5d687ed66595f5be8576f6c3c Mon Sep 17 00:00:00 2001
From: lapineige <lapineige@users.noreply.github.com>
Date: Sun, 14 Mar 2021 21:35:44 +0100
Subject: [PATCH] Testing (#69)

Fix #67 #65
---
 manifest.json   | 4 ++--
 scripts/upgrade | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/manifest.json b/manifest.json
index 19c14bf..a5b2d35 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,11 +6,11 @@
     "en": "The personal, minimalist, super-fast, no-database delicious clone",
     "fr": "Clone de delicious, rapide, simple et sans base de données."
   },
-  "version": "0.12.1~ynh1",
+  "version": "0.12.1~ynh2",
   "url": "https://github.com/shaarli/Shaarli",
   "license": "MIT",
   "maintainer": {
-    "name": "Lapineige et rafi59",
+    "name": "lapineige et rafi59",
     "email": "rafi59_dev@srvmaison.fr.nf",
     "url": ""
   },
diff --git a/scripts/upgrade b/scripts/upgrade
index 626454a..9b3d266 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -65,7 +65,7 @@ ynh_abort_if_errors
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
 
-if [ "$upgrade_type" == "UPGRADE_APP" ]
+if [ "$upgrade_type" == "UPGRADE_APP" ] || [ "$upgrade_type" == "UPGRADE_FORCED" ] # we should do that during a force upgrade too (as it could lead to a version upgrade for instance)
 then
 	ynh_script_progression --message="Upgrading source files..."
 
@@ -83,7 +83,7 @@ then
 	ynh_setup_source --dest_dir="$final_path"
 
 	cp -a "$tmpdir/data" "$final_path/"
-	cp -a "$tmpdir/tpl" "$final_path/"
+	cp -a -n "$tmpdir/tpl" "$final_path/" # copy without erasing existing templates (from official source)
 
 	# Remove the tmp directory securely
 	ynh_secure_remove --file="$tmpdir"