From f9fa1b2917a7a18fbe6a3712661a91c5aff9adb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sat, 25 Jun 2022 18:57:45 +0200
Subject: [PATCH] Testing (#75)

* 22.06

* Auto-update README

* Update manifest.json

* Fix

* 22.06.1

* Auto-update README

* Update upgrade

Co-authored-by: yunohost-bot <yunohost@yunohost.org>
---
 README.md       | 2 +-
 README_fr.md    | 2 +-
 conf/app.src    | 4 ++--
 manifest.json   | 2 +-
 scripts/upgrade | 8 ++++----
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 659e269..321035c 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out
 - Multi-Lingual
 
 
-**Shipped version:** 22.06~ynh1
+**Shipped version:** 22.06.1~ynh1
 
 **Demo:** https://demo.bookstackapp.com
 
diff --git a/README_fr.md b/README_fr.md
index 38e932e..6ec32bd 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -26,7 +26,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out
 - Multi-Lingual
 
 
-**Version incluse :** 22.06~ynh1
+**Version incluse :** 22.06.1~ynh1
 
 **Démo :** https://demo.bookstackapp.com
 
diff --git a/conf/app.src b/conf/app.src
index 0b2bc4e..26230c4 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/BookStackApp/BookStack/archive/refs/tags/v22.06.tar.gz
-SOURCE_SUM=1c8a8afee7df3e628ff83224bc62a7b5de69689fd67996cf0742e6220bd5e589
+SOURCE_URL=https://github.com/BookStackApp/BookStack/archive/refs/tags/v22.06.1.tar.gz
+SOURCE_SUM=e1a92b3815653342c9eb4e8de8050f8ce32d61d628ce3198ea51ef05effd3e2e
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/manifest.json b/manifest.json
index 4dd239d..3a64d98 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": "22.06~ynh1",
+    "version": "22.06.1~ynh1",
     "url": "https://www.bookstackapp.com/",
     "upstream": {
         "license": "MIT",
diff --git a/scripts/upgrade b/scripts/upgrade
index 978de98..bb943a3 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -100,7 +100,7 @@ then
 	ynh_script_progression --message="Upgrading source files..." --weight=1
 
 	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$final_path" --keep="$final_path/public/uploads $final_path/storage/uploads"
+	ynh_setup_source --dest_dir="$final_path" --keep="$final_path/.env $final_path/public/uploads $final_path/storage/uploads"
 fi
 
 #=================================================
@@ -138,11 +138,11 @@ ynh_install_composer
 #=================================================
 # MODIFY A CONFIG FILE
 #=================================================
-ynh_script_progression --message="Adding a configuration file..." --weight=1
+#ynh_script_progression --message="Adding a configuration file..." --weight=1
 
-app_url_domain="https://$domain${path_url%/}"
+#app_url_domain="https://$domain${path_url%/}"
 
-ynh_add_config --template=../conf/.env.example --destination=$final_path/.env
+#ynh_add_config --template=../conf/.env.example --destination=$final_path/.env
 
 #=================================================
 # FINAL BOOKSTACK INSTALL