From 8160a44605f3400f7abd6d82b4ddd43fb57834a0 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Tue, 29 Jun 2021 13:40:44 +0200
Subject: [PATCH] set core:upgrade

---
 conf/icons.src     |  6 ------
 scripts/_common.sh |  3 ---
 scripts/install    |  4 ----
 scripts/upgrade    | 17 ++++++++++++-----
 4 files changed, 12 insertions(+), 18 deletions(-)
 delete mode 100644 conf/icons.src

diff --git a/conf/icons.src b/conf/icons.src
deleted file mode 100644
index 6ffad8e..0000000
--- a/conf/icons.src
+++ /dev/null
@@ -1,6 +0,0 @@
-SOURCE_URL=https://github.com/matomo-org/matomo-icons/archive/e96ef33bf490794829831cbb795fd4ea67259699.tar.gz
-SOURCE_SUM=9a6457d8f138216f911621db7a5af5fbce7214e62d6f184730f216986e498b53
-SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=tar.gz
-SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 00f941c..e932edf 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -8,9 +8,6 @@ YNH_PHP_VERSION="7.3"
 
 extra_php_dependencies="php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-mbstring"
 
-# Composer version
-YNH_COMPOSER_VERSION="2.0.13"
-
 #=================================================
 # PERSONAL HELPERS
 #=================================================
diff --git a/scripts/install b/scripts/install
index 1bfda1e..7853563 100755
--- a/scripts/install
+++ b/scripts/install
@@ -94,10 +94,6 @@ ynh_script_progression --message="Configuring PHP-FPM..."
 ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencies"
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
-#=================================================
-# SPECIFIC SETUP
-#=================================================
-
 #=================================================
 # SETUP A CRON
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 5d36b94..eef87a7 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -91,8 +91,19 @@ then
 		# This condition is only for CI test to go through the upgrade process
 		ynh_setup_source --dest_dir="$final_path"
 	else
+		# Create a temporary directory
+		tmpdir="$(mktemp -d)"
+
+		cp -a "$final_path/config/config.ini.php" "$tmpdir/config.ini.php"
+		# 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/config/config.ini.php"
+		ynh_setup_source --dest_dir="$final_path"
+		cp -a "$tmpdir/config_inc.php" "$final_path/config/config_inc.php"
+		# Remove the tmp directory securely
+		ynh_secure_remove --file="$tmpdir"
+
+		php$phpversion $final_path/console core:update -n
 	fi
 fi
 
@@ -116,10 +127,6 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..."
 # Create a dedicated PHP-FPM config
 ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencies"
 
-#=================================================
-# SPECIFIC UPGRADE
-#=================================================
-
 #=================================================
 # SETUP A CRON
 #=================================================