From 06722ed55d113b1258233ff78b8104af964c26c3 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Tue, 18 May 2021 11:41:30 +0200
Subject: [PATCH] Fix

---
 scripts/install |  2 +-
 scripts/upgrade | 20 ++------------------
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/scripts/install b/scripts/install
index 8b9e8e7..5967a78 100755
--- a/scripts/install
+++ b/scripts/install
@@ -103,7 +103,7 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 #=================================================
 ynh_script_progression --message="Installing Composer and dependencies..."
 
-ynh_install_composer #--phpversion="$phpversion" --workdir="$final_path"
+ynh_install_composer
 
 # Install missing icons
 ynh_setup_source --dest_dir="$final_path/plugins/Morpheus/icons" --source_id="icons"
diff --git a/scripts/upgrade b/scripts/upgrade
index 966a796..fb41339 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -84,16 +84,7 @@ then
 		ynh_setup_source --dest_dir="$final_path"
 	else
 		# Download, check integrity, uncompress and patch the source from app.src
-		ynh_setup_source --dest_dir="$final_path" #--keep="foo bar" to integrate when https://github.com/YunoHost/yunohost/pull/1200 is upstream
-
-		# Copy the admin saved settings from tmp directory to final path	
-		cp -a "$tmpdir/config.ini.php" "$final_path/config/config.ini.php" 
-
-		# Remove the tmp directory securely
-		ynh_secure_remove --file="$tmpdir"
-
-		# Download, check integrity, uncompress and patch the source from app.src
-		#ynh_setup_source --dest_dir="$final_path" --keep="$final_path/config/config.ini.php"
+		ynh_setup_source --dest_dir="$final_path" --keep="$final_path/config/config.ini.php"
 	fi
 fi
 
@@ -130,14 +121,7 @@ ynh_script_progression --message="Installating composer and dependencies..."
 
 if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
-
-ynh_install_composer --phpversion="$phpversion" --workdir="$final_path"
-
-# if [[ -f "$final_path/config/config.ini.php" ]]; then
-# 	php$phpversion $final_path/console core:update -n
-# fi
-
-
+	ynh_install_composer
 	php$phpversion $final_path/console core:update -n
 fi