From f9ead85cfe8042c916825d03c612ca546d8f3670 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Mon, 1 Jul 2024 18:00:53 +0200
Subject: [PATCH] Fix the patches stuff, there's no need to manually cp stuff,
 patches are already applied only for the 'main' source

---
 manifest.toml                                                   | 1 +
 .../main/00-add-logout_url-conf.patch                           | 0
 .../main/01-disable-CSPv3-nonce_and_allow-YNH-fonts.patch       | 0
 .../02-Allow-for-eval-in-JS-scripts-for-YunoHost-tile.patch     | 0
 scripts/install                                                 | 2 --
 scripts/upgrade                                                 | 1 -
 6 files changed, 1 insertion(+), 3 deletions(-)
 rename sources/patches_last_version/app-00-add-logout_url-conf.patch => patches/main/00-add-logout_url-conf.patch (100%)
 rename sources/patches_last_version/app-01-disable-CSPv3-nonce_and_allow-YNH-fonts.patch => patches/main/01-disable-CSPv3-nonce_and_allow-YNH-fonts.patch (100%)
 rename sources/patches_last_version/app-02-Allow-for-eval-in-JS-scripts-for-YunoHost-tile.patch => patches/main/02-Allow-for-eval-in-JS-scripts-for-YunoHost-tile.patch (100%)

diff --git a/manifest.toml b/manifest.toml
index f93f835..18e7670 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -73,6 +73,7 @@ ram.runtime = "512M"
         [resources.sources.28]
         url = 'https://download.nextcloud.com/server/releases/nextcloud-28.0.0.tar.bz2'
         sha256 = '4e8b0b74b40221e85f92ab869d0873c69a52d7e43889d9259c6259428a6a36f2'
+        prefetch = false
 
         [resources.sources.27]
         url = 'https://download.nextcloud.com/server/releases/nextcloud-27.0.0.tar.bz2'
diff --git a/sources/patches_last_version/app-00-add-logout_url-conf.patch b/patches/main/00-add-logout_url-conf.patch
similarity index 100%
rename from sources/patches_last_version/app-00-add-logout_url-conf.patch
rename to patches/main/00-add-logout_url-conf.patch
diff --git a/sources/patches_last_version/app-01-disable-CSPv3-nonce_and_allow-YNH-fonts.patch b/patches/main/01-disable-CSPv3-nonce_and_allow-YNH-fonts.patch
similarity index 100%
rename from sources/patches_last_version/app-01-disable-CSPv3-nonce_and_allow-YNH-fonts.patch
rename to patches/main/01-disable-CSPv3-nonce_and_allow-YNH-fonts.patch
diff --git a/sources/patches_last_version/app-02-Allow-for-eval-in-JS-scripts-for-YunoHost-tile.patch b/patches/main/02-Allow-for-eval-in-JS-scripts-for-YunoHost-tile.patch
similarity index 100%
rename from sources/patches_last_version/app-02-Allow-for-eval-in-JS-scripts-for-YunoHost-tile.patch
rename to patches/main/02-Allow-for-eval-in-JS-scripts-for-YunoHost-tile.patch
diff --git a/scripts/install b/scripts/install
index 3c0ca8e..3436805 100755
--- a/scripts/install
+++ b/scripts/install
@@ -25,8 +25,6 @@ ynh_mysql_db_shell \
 #=================================================
 ynh_script_progression "Setting up source files..."
 
-# Enable YunoHost patches on Nextcloud sources
-cp -a ../sources/patches_last_version/* ../sources/patches
 # Download, check integrity, uncompress and patch the source from app.src
 ynh_setup_source --dest_dir="$install_dir"
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 6755aca..6db44ea 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -155,7 +155,6 @@ then
         next_major_version="$(( $current_major_version + 1 ))"
         if [[ "$next_major_version" -ge "$last_major_version" ]]; then
             ynh_print_info "Upgrading to Nextcloud $last_version"
-            cp -a ../patches_last_version/* ../patches
             source_id="main"
         else
             ynh_print_info "Upgrading to Nextcloud $next_major_version"