From 07bfd24e0c3c4048d3b549b6746446d162b2a00d Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sun, 16 May 2021 07:36:01 +0200
Subject: [PATCH] 1.19.0

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

diff --git a/README.md b/README.md
index 0990358..dd136f0 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/install) to k
 
 Backdrop CMS is a simple, lightweight, and easy-to-use Content Management System for building professional websites.
 
-**Shipped version:** 1.18.3
+**Shipped version:** 1.19.0
 
 ## Screenshots
 
diff --git a/README_fr.md b/README_fr.md
index 33646b3..4698511 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -12,7 +12,7 @@ Si vous n’avez pas YunoHost, consultez [le guide](https://yunohost.org/install
 
 Backdrop CMS is a simple, lightweight, and easy-to-use Content Management System for building professional websites.
 
-**Version incluse :** 1.18.3
+**Version incluse :** 1.19.0
 
 ## Captures d’écran
 
diff --git a/check_process b/check_process
index f0d3ba9..35f9200 100644
--- a/check_process
+++ b/check_process
@@ -1,8 +1,8 @@
 ;; Nom du test
 	; Manifest
-		domain="domain.tld"	(DOMAIN)
-		path="/path"	    (PATH)
-		is_public=1	(PUBLIC|public=1|private=0)
+		domain="domain.tld"
+		path="/path"
+		is_public=1
 	; Checks
 		pkg_linter=1
 		setup_sub_dir=1
diff --git a/conf/app.src b/conf/app.src
index 2fabc25..cb7108a 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/backdrop/backdrop/releases/download/1.18.3/backdrop.zip
-SOURCE_SUM=fb82cb6020db15954ed23976c513d3d0f713aa1c77759be065106e4f57b2999b
+SOURCE_URL=https://github.com/backdrop/backdrop/releases/download/1.19.0/backdrop.zip
+SOURCE_SUM=a19ff45d576ad60792b22061b28dfda4a85980aaa7ee5dcd738513894e55192d
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=true
diff --git a/manifest.json b/manifest.json
index 2308e47..0ce5d1e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
     "en": "Easy-to-use CMS for building professional websites",
     "fr": "CMS facile à utiliser pour créer des sites Web professionnels"
   },
-  "version": "1.18.3~ynh1",
+  "version": "1.19.0~ynh1",
   "url": "https://backdropcms.org/",
   "license": "GPL-2.0",
   "maintainer": {
@@ -14,7 +14,7 @@
     "email": ""
   },
   "requirements": {
-    "yunohost": ">= 4.1.7"
+    "yunohost": ">= 4.2.4"
   },
   "multi_instance": true,
   "services": [
diff --git a/scripts/upgrade b/scripts/upgrade
index 69a1bf9..c41db9e 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -85,23 +85,8 @@ if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
 	ynh_script_progression --message="Reconfiguring Backdrop..." --weight=2
 
-	# Create a temporary directory
-	tmpdir="$(mktemp -d)"
-
-	# Backup the config file in the temp dir
-	cp -a "$final_path/settings.php" "$tmpdir/settings.php"
-
-	# 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/settings.php" "$final_path/settings.php"
-
-	# Remove the tmp directory securely
-	ynh_secure_remove --file="$tmpdir"
+	ynh_setup_source --dest_dir="$final_path" --keep="$final_path/settings.php"
 fi
 
 #=================================================