From 8d2ed9df78449849c44fc50b596f9e93f98e0143 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Tue, 16 Nov 2021 14:47:44 +0100
Subject: [PATCH] 21.11

---
 conf/app.src    |  4 ++--
 manifest.json   |  2 +-
 scripts/upgrade | 31 +++++--------------------------
 3 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/conf/app.src b/conf/app.src
index ed49582..4f4479a 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/BookStackApp/BookStack/archive/refs/tags/v21.10.3.tar.gz
-SOURCE_SUM=b22b0949103c6f34fa0613b9c40bed101e58821d401ee99efe437441451f6c86
+SOURCE_URL=https://github.com/BookStackApp/BookStack/archive/refs/tags/v21.11.tar.gz
+SOURCE_SUM=ce20cb1ac3c81971d2f68e5d3b992191ee9510261ffc0a89fc1bbac9d6544bcb
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/manifest.json b/manifest.json
index 28ac9c9..b000e1e 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.10.3~ynh1",
+    "version": "21.11~ynh1",
     "url": "https://www.bookstackapp.com/",
     "upstream": {
         "license": "MIT",
diff --git a/scripts/upgrade b/scripts/upgrade
index 8989bdd..5d70f6b 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -61,29 +61,14 @@ 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"
-	#cp -a "$final_path/public/uploads" "$tmpdir/public/uploads"
-	#cp -a "$final_path/storage/uploads" "$tmpdir/storage/uploads"
-
-	# 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" --keep="$final_path/.env $final_path/public/uploads $final_path/storage/uploads"
-
-	# Copy the admin saved settings from tmp directory to final path  
-	#cp -a "$tmpdir/.env" "$final_path/.env"
-	#cp -a "$tmpdir/public/uploads" "$final_path/public/uploads" 
- 	#cp -a "$tmpdir/storage/uploads" "$final_path/storage/uploads" 
-
- 	# Remove the tmp directory securely
-	#ynh_secure_remove --file="$tmpdir"
 fi
 
+chmod 755 $final_path
+chmod -R o-rwx $final_path
+chown -R $app:www-data $final_path
+
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
@@ -113,7 +98,7 @@ ynh_add_fpm_config
 ynh_script_progression --message="Installing BookStack with Composer..." --weight=5
 
 # Install composer
-ynh_install_composer --phpversion=$phpversion --workdir=$final_path --install_args="--no-dev"
+ynh_install_composer --install_args="--no-dev"
 
 #=================================================
 # FINAL BOOKSTACK INSTALL
@@ -127,12 +112,6 @@ pushd $final_path
  	php$phpversion artisan view:clear --no-interaction
 popd
 
-# Set permissions on app files
-chmod 755 $final_path
-chmod -R o-rwx $final_path
-chown -R $app:www-data $final_path
-chmod 600 $final_path/.env
-
 #=================================================
 # RELOAD NGINX
 #=================================================