From 38a1d08c8bee55c21079b07e97d6fe2eb036caf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 16 May 2021 07:39:02 +0200
Subject: [PATCH] 21.04.5 (#29)

---
 README.md       |  2 +-
 README_fr.md    |  2 +-
 conf/app.src    |  4 ++--
 manifest.json   |  2 +-
 scripts/upgrade | 17 +----------------
 5 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/README.md b/README.md
index 4e9fda9..0d83fbc 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ BookStack is a simple, self-hosted, easy-to-use platform for organising and stor
 
 BookStack is built using PHP, on top of the Laravel framework and it uses MySQL to store data.
 
-**Shipped version:** 21.04.4
+**Shipped version:** 21.04.5
 
 ## Screenshots
 
diff --git a/README_fr.md b/README_fr.md
index cbb5456..59bbcc8 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)
 ## Overview
 BookStack est une plate-forme simple, auto-hébergée et facile à utiliser pour organiser et stocker des informations.
 
-**Version incluse :** 21.04.4
+**Version incluse :** 21.04.5
 
 ## Screenshots
 
diff --git a/conf/app.src b/conf/app.src
index 77098a4..f3057c0 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/BookStackApp/BookStack/archive/refs/tags/v21.04.4.tar.gz
-SOURCE_SUM=c8b4a13596f0d4c9992594b79a0bd8e911efb483ebb1eb06895d50edd40a583e
+SOURCE_URL=https://github.com/BookStackApp/BookStack/archive/refs/tags/v21.04.5.tar.gz
+SOURCE_SUM=d63e9d1bad3f8e241fea8bcf94089864642e3dd2cc3f5ff0156bf37a0ef3bcaa
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/manifest.json b/manifest.json
index 103d774..96a971b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Platform to create documentation/wiki content",
         "fr": "Plateforme pour créer du contenu de documentation/wiki "
     },
-    "version": "21.04.4~ynh1",
+    "version": "21.04.5~ynh1",
     "url": "https://www.bookstackapp.com/",
     "license": "MIT",
     "maintainer": {
diff --git a/scripts/upgrade b/scripts/upgrade
index 901c749..21ac861 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -61,23 +61,8 @@ if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
 	ynh_script_progression --message="Upgrading source files..." --weight=1
 
-	# Create a temporary directory
-	tmpdir="$(mktemp -d)"
-
-	# Backup the config file in the temp dir
-	cp -a "$final_path/.env" "$tmpdir/.env"
-
-	# Remove the app directory securely
-	ynh_secure_remove --file="$final_path"
-
 	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$final_path"
-
-	# Copy the admin saved settings from tmp directory to final path	
-	cp -a "$tmpdir/.env" "$final_path/.env" 
-
-	# Remove the tmp directory securely
-	ynh_secure_remove --file="$tmpdir"
+	ynh_setup_source --dest_dir="$final_path" --keep="$final_path/.env"
 fi
 
 #=================================================