From 1731f9223ba6cb1416a10e3b728657f68c0c9de3 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Tue, 19 Oct 2021 12:45:44 +0200
Subject: [PATCH] Update upgrade

---
 scripts/upgrade | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 702d20c..b912fb3 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -112,6 +112,10 @@ then
 	ynh_setup_source --dest_dir="$final_path"
 fi
 
+chmod 750 "$final_path"
+chmod -R o-rwx "$final_path"
+chown -R $app:www-data "$final_path"
+
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
@@ -152,7 +156,7 @@ then
     # Check if dependencies need to be updated with Composer
     if [ -f "$final_path/composer.json" ]
     then
-        ynh_exec_warn_less ynh_composer_exec --commands=\"update --no-dev --prefer-dist\"
+        ynh_exec_warn_less ynh_composer_exec --commands="update"
     else
         # Install composer.json
         cp "$final_path/composer.json-dist" "$final_path/composer.json"
@@ -166,9 +170,6 @@ then
     # Create logs and temp directories
     mkdir -p "$final_path/"{logs,temp}
 
-    # Install Installer Update for Composer 2.0
-    ynh_composer_exec --commands="require roundcube/plugin-installer:>=0.2.0"
-
     # Install net_LDAP
     ynh_composer_exec --commands="require kolab/net_ldap3"
 
@@ -247,10 +248,6 @@ then
     ynh_exec_warn ./bin/update.sh --version=$oldversion -y)
 fi
 
-chmod 750 "$final_path"
-chmod -R o-rwx "$final_path"
-chown -R $app:www-data "$final_path"
-
 #=================================================
 # RELOAD NGINX
 #=================================================