From 83f3363548c07e0ebabd7745a09dcce1ab6afe87 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sat, 30 Jan 2021 20:17:26 +0100
Subject: [PATCH] Update upgrade

---
 scripts/upgrade | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index bbda9ca..8458f9d 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -86,8 +86,7 @@ ynh_add_fpm_config --package="$extra_php_dependencies"
 #=================================================
 ynh_script_progression --message="Upgrading Composer..." --weight=1
 
-# Upgrade composer itself
-ynh_install_composer #--phpversion=${phpversion} --workdir=$final_path --install_args="--prefer-source --no-dev"
+ynh_install_composer --phpversion=$phpversion --workdir=$final_path --install_args="--prefer-source --no-dev"
 
 #=================================================
 # MODIFY A CONFIG FILE
@@ -104,16 +103,13 @@ ynh_replace_string --match_string="__APP__" --replace_string="$app" --target_fil
 ynh_store_file_checksum $final_path/.env
 
 #=================================================
-# INSTALL AND INITIALIZE COMPOSER
+# FINAL BOOKSTACK INSTALL
 #=================================================
-ynh_script_progression --message="Upgrading source files..." --weight=10
+ynh_script_progression --message="Install BookStack" --weight=5
 
 pushd $final_path
-	# install the PHP dependencies using Composer
-	ynh_composer_exec phpversion="$phpversion" workdir="$final_path" --commands="install --no-dev"
-	php$phpversion artisan migrate --no-interaction
-	#php$phpversion artisan cache:clear --no-interaction
-	#php$phpversion artisan view:clear --no-interaction
+	php$phpversion artisan key:generate --no-interaction --force
+	php$phpversion artisan migrate --no-interaction --force
 popd
 
 #=================================================