From 7d25e4ecaf14da55b9ca6d32cbbc0b43226e13e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 26 Jul 2024 21:17:53 +0200
Subject: [PATCH] Update upgrade

---
 scripts/upgrade | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index fa51ffd..eeab55a 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -39,6 +39,9 @@ filter_boring_occ_warnings() {
 current_version=$(grep OC_VersionString "$install_dir/version.php" | cut -d\' -f2)
 current_major_version=${current_version%%.*}
 
+last_version=$(ynh_read_manifest --manifest_key="resources.sources.main.url" | grep -o '[0-9][0-9]\.[0-9]\.[0-9]')
+last_major_version=${last_version%%.*}
+
 # Define a function to execute commands with `occ`
 exec_occ() {
     # Backward compatibility to upgrade from older versions
@@ -135,11 +138,11 @@ function list_installed_apps_not_compatible_with_future_version()
     comm -23 <(comm -23 $installed_apps $core_apps_in_current_version) $nextcloud_destination_appcatalog
 }
 
-current_version=$(grep OC_VersionString "$install_dir/version.php" | cut -d\' -f2)
-current_major_version=${current_version%%.*}
+#current_version=$(grep OC_VersionString "$install_dir/version.php" | cut -d\' -f2)
+#current_major_version=${current_version%%.*}
 
-last_version=$(ynh_read_manifest --manifest_key="resources.sources.main.url" | grep -o '[0-9][0-9]\.[0-9]\.[0-9]')
-last_major_version=${last_version%%.*}
+#last_version=$(ynh_read_manifest --manifest_key="resources.sources.main.url" | grep -o '[0-9][0-9]\.[0-9]\.[0-9]')
+#last_major_version=${last_version%%.*}
 
 if [[ "$last_major_version" != "$current_major_version" ]]
 then