From b678d77ee9f1f8c797ba5187838a6d843fad9e17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 12 Jan 2024 13:56:03 +0100
Subject: [PATCH 01/21] Fix

---
 doc/ADMIN.md    | 2 +-
 doc/ADMIN_fr.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/ADMIN.md b/doc/ADMIN.md
index e9b7da81..8d401d2f 100644
--- a/doc/ADMIN.md
+++ b/doc/ADMIN.md
@@ -3,7 +3,7 @@
 You can run Nextcloud commands from the command line using:
 
 ```
-sudo -u __APP__ php__YNH_PHP_VERSION__ --define apc.enable_cli=1 __INSTALL_DIR__/occ ...
+sudo -u __APP__ php__PHPVERSION__ --define apc.enable_cli=1 __INSTALL_DIR__/occ ...
 ```
 
 Alternatively, you may open a 'Nextcloud shell' with `sudo yunohost app shell __APP__`, then run `php occ ...`
diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md
index 85445bd2..06b76b12 100644
--- a/doc/ADMIN_fr.md
+++ b/doc/ADMIN_fr.md
@@ -3,7 +3,7 @@
 Vous pouvez lancer des commandes Nextcloud depuis la ligne de commande avec:
 
 ```
-sudo -u __APP__ php__YNH_PHP_VERSION__ --define apc.enable_cli=1 __INSTALL_DIR__/occ ...
+sudo -u __APP__ php__PHPVERSION__ --define apc.enable_cli=1 __INSTALL_DIR__/occ ...
 ```
 
 Ou bien, vous pouvez ouvrir un "shell Nextcloud" avec `sudo yunohost app shell __APP__`, puis lancer `php occ ...`

From 2cd5f4d85b3274034065efa4f267d1332ac2dbce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 12 Jan 2024 18:30:43 +0100
Subject: [PATCH 02/21] cleaning

---
 scripts/install |  6 +++---
 scripts/upgrade | 28 ++++++++++++++--------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/scripts/install b/scripts/install
index 6e5858a7..787641dc 100755
--- a/scripts/install
+++ b/scripts/install
@@ -108,7 +108,7 @@ exec_occ ldap:create-empty-config
 
 # Load the installation config file in Nextcloud
 nc_conf="$install_dir/config_install.json"
-ynh_add_config --template="../conf/config_install.json" --destination="$nc_conf"
+ynh_add_config --template="config_install.json" --destination="$nc_conf"
 
 exec_occ config:import "$nc_conf"
 
@@ -117,7 +117,7 @@ ynh_secure_remove --file="$nc_conf"
 
 # Load the additional config file (used also for upgrade)
 nc_conf="$install_dir/config.json"
-ynh_add_config --template="../conf/config.json" --destination="$nc_conf"
+ynh_add_config --template="config.json" --destination="$nc_conf"
 
 exec_occ config:import "$nc_conf"
 
@@ -201,7 +201,7 @@ ynh_store_file_checksum --file="$install_dir/config/config.php"
 #=================================================
 
 cron_path="/etc/cron.d/$app"
-ynh_add_config --template="../conf/nextcloud.cron" --destination="$cron_path"
+ynh_add_config --template="nextcloud.cron" --destination="$cron_path"
 chown root: "$cron_path"
 chmod 644 "$cron_path"
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 280eb7d0..715c330c 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -184,7 +184,7 @@ EOF
         # Upgrade Nextcloud (SUCCESS = 0, UP_TO_DATE = 3)
         exec_occ maintenance:mode --off
         exec_occ upgrade \
-        || [ $? -eq 3 ] || ynh_die --message="Unable to upgrade Nextcloud"
+        || [ $? -eq 3 ] || ynh_die --message="Unable to upgrade $app"
 
         # Get the new current version number
         current_version=$(grep OC_VersionString "$install_dir/version.php" | cut -d\' -f2)
@@ -202,13 +202,13 @@ EOF
     #=================================================
     # CONFIGURE NEXTCLOUD
     #=================================================
-    ynh_script_progression --message="Reconfiguring Nextcloud..." --weight=9
+    ynh_script_progression --message="Reconfiguring $app..." --weight=9
 
     # Verify the checksum and backup the file if it's different
     ynh_backup_if_checksum_is_different --file="$install_dir/config/config.php"
 
     nc_conf="${install_dir}/config.json"
-    ynh_add_config --template="../conf/config.json" --destination="$nc_conf"
+    ynh_add_config --template="config.json" --destination="$nc_conf"
 
     # Reneable the mail app
     if [ $mail_app_must_be_reactived -eq 1 ]; then
@@ -295,15 +295,15 @@ chmod 750 $install_dir
 #=================================================
 ynh_script_progression --message="Regenerating system configurations for $app..." --weight=2
 
-# -------
+#-------------------------------------------------
 # PHP-FPM
-# -------
+#-------------------------------------------------
 
 ynh_add_fpm_config
 
-# -------
+#-------------------------------------------------
 # NGINX
-# -------
+#-------------------------------------------------
 
 # Delete current NGINX configuration to be able to check if .well-known is already served.
 ynh_backup_if_checksum_is_different --file="/etc/nginx/conf.d/$domain.d/$app.conf"
@@ -325,24 +325,24 @@ fi
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
-# -------
+#-------------------------------------------------
 # CRON JOB
-# -------
+#-------------------------------------------------
 cron_path="/etc/cron.d/$app"
-ynh_add_config --template="../conf/nextcloud.cron" --destination="$cron_path"
+ynh_add_config --template="nextcloud.cron" --destination="$cron_path"
 chown root: "$cron_path"
 chmod 644 "$cron_path"
 
 exec_occ background:cron
 
-# -------
+#-------------------------------------------------
 # LOGROTATE
-# -------
+#-------------------------------------------------
 ynh_use_logrotate --non-append
 
-# -------
+#-------------------------------------------------
 # FAIL2BAN
-# -------
+#-------------------------------------------------
 
 # Create a dedicated Fail2Ban config
 ynh_add_fail2ban_config --logpath="/home/yunohost.app/$app/data/nextcloud.log" --failregex="^.*Login failed: '.*' \(Remote IP: '<HOST>'.*$" --max_retry=5

From 6e9e4d680e9b33ec19dffe6b9af6b59f434c9c64 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <4533074+alexAubin@users.noreply.github.com>
Date: Fri, 12 Jan 2024 20:47:14 +0100
Subject: [PATCH 03/21] Upgrade script: check that installed apps are
 compatible with the future version before actually starting the upgrade

---
 scripts/upgrade | 41 +++++++++++++++++++++++++++++++++++------
 1 file changed, 35 insertions(+), 6 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 715c330c..aaa265a3 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -74,16 +74,45 @@ local mount_id=$(exec_occ files_external:create --output=json \
     || exec_occ files_external:option "$mount_id" enable_sharing true
 }
 
+function list_installed_apps_not_compatible_with_future_version()
+{
+    local nextcloud_destination_version="$1"
+    local nextcloud_current_version="$(grep OC_VersionString "$install_dir/version.php" | cut -d\' -f2)"
+    local installed_apps=$(mktemp)
+    local core_apps_in_current_version=$(mktemp)
+    local nextcloud_destination_appcatalog=$(mktemp)
+
+    # List installed apps
+    exec_occ app:list --output json | jq -r ".enabled | keys[]" | sort > $installed_apps
+    # Fetch Nextcloud list of core apps from their github repo for the current version
+    curl -s https://raw.githubusercontent.com/nextcloud/server/v$nextcloud_current_version.0.0/core/shipped.json | jq -r '.shippedApps[]' | sort > $core_apps_in_current_version
+    # Fetch Nextcloud app catalog (doesnt contain core app) for the future version
+    curl -s https://apps.nextcloud.com/api/v1/platform/$nextcloud_destination_appcatalog.0.0/apps.json | jq -r '.[] | .id' | sort > $nextcloud_destination_appcatalog
+
+    # Compute set complement, cf https://catonmat.net/set-operations-in-unix-shell
+    # We want to list the installed apps which are neither core apps nor in the destination catalog
+    comm -23 <(comm -23 $installed_apps $core_apps_in_current_version) $nextcloud_destination_appcatalog
+}
+
+# Load the last available version
+source upgrade.d/upgrade.last.sh
+last_version=$next_version
+
+last_major_version=${last_version%%.*}
+
+if [[ "$last_major_version" != "$current_major_version" ]]
+then
+    installed_apps_not_compatible_with_future_version="$(list_installed_apps_not_compatible_with_future_version $last_major_version)"
+    if [[ -n "$installed_apps_not_compatible_with_future_version" ]]
+    then
+        ynh_die --message="The following apps are not (yet?) compatible with Nextcloud $last_major_version. You should make sure to upgrade the app, or disable it, or wait for it to become compatible before running this upgrade : $installed_apps_not_compatible_with_future_version"
+    fi
+fi
+
 if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
     ynh_script_progression --message="Upgrading Nextcloud..." --weight=3
 
-    # Load the last available version
-    source upgrade.d/upgrade.last.sh
-    last_version=$next_version
-
-    last_major_version=${last_version%%.*}
-
     # Set write access for the following commands
     chown -R $app: "$install_dir" "$data_dir"
 

From ab32f35ce999067ef767eb2f11e1d6d5914e0f35 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <4533074+alexAubin@users.noreply.github.com>
Date: Fri, 12 Jan 2024 20:55:24 +0100
Subject: [PATCH 04/21] Create PRE_UPGRADE.md to encourage people to check
 their apps are up to date before running the upgrade

---
 doc/PRE_UPGRADE.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/PRE_UPGRADE.md

diff --git a/doc/PRE_UPGRADE.md b/doc/PRE_UPGRADE.md
new file mode 100644
index 00000000..58e7dc24
--- /dev/null
+++ b/doc/PRE_UPGRADE.md
@@ -0,0 +1 @@
+If you are upgrading to a new major version of Nextcloud, please make sure that your Nextcloud apps are up to date from Nextcloud's administration panel beforehand.

From e71c5ca44b9558133dee3ac9c8b36fb6f64419a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 14 Jan 2024 19:33:37 +0100
Subject: [PATCH 05/21] Fix disk space

---
 manifest.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.toml b/manifest.toml
index 4d53e38d..2fc672f3 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -27,7 +27,7 @@ ldap = true
 
 sso = true
 
-disk = "50M"
+disk = "650M"
 ram.build = "500M"
 ram.runtime = "512M"
 

From 64a5081946e494dd489abb0da14162c65f5f8d16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 14 Jan 2024 19:34:14 +0100
Subject: [PATCH 06/21] Update manifest.toml

---
 manifest.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.toml b/manifest.toml
index 2fc672f3..79f0511e 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -28,7 +28,7 @@ ldap = true
 sso = true
 
 disk = "650M"
-ram.build = "500M"
+ram.build = "250M"
 ram.runtime = "512M"
 
 [install]

From 53eaa33618267ecb2c91761d72bb992f3eb8afa5 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <4533074+alexAubin@users.noreply.github.com>
Date: Wed, 17 Jan 2024 02:02:57 +0100
Subject: [PATCH 07/21] Update scripts/upgrade: fix fetching of shipped app for
 current version

---
 scripts/upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index aaa265a3..eaf6a365 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -85,7 +85,7 @@ function list_installed_apps_not_compatible_with_future_version()
     # List installed apps
     exec_occ app:list --output json | jq -r ".enabled | keys[]" | sort > $installed_apps
     # Fetch Nextcloud list of core apps from their github repo for the current version
-    curl -s https://raw.githubusercontent.com/nextcloud/server/v$nextcloud_current_version.0.0/core/shipped.json | jq -r '.shippedApps[]' | sort > $core_apps_in_current_version
+    curl -s https://raw.githubusercontent.com/nextcloud/server/v$nextcloud_current_version/core/shipped.json | jq -r '.shippedApps[]' | sort > $core_apps_in_current_version
     # Fetch Nextcloud app catalog (doesnt contain core app) for the future version
     curl -s https://apps.nextcloud.com/api/v1/platform/$nextcloud_destination_appcatalog.0.0/apps.json | jq -r '.[] | .id' | sort > $nextcloud_destination_appcatalog
 

From d7e05b002216f8df2b867766520dda6b7bd99548 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <4533074+alexAubin@users.noreply.github.com>
Date: Wed, 17 Jan 2024 02:04:44 +0100
Subject: [PATCH 08/21] Update scripts/upgrade

---
 scripts/upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index eaf6a365..87f124a2 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -87,7 +87,7 @@ function list_installed_apps_not_compatible_with_future_version()
     # Fetch Nextcloud list of core apps from their github repo for the current version
     curl -s https://raw.githubusercontent.com/nextcloud/server/v$nextcloud_current_version/core/shipped.json | jq -r '.shippedApps[]' | sort > $core_apps_in_current_version
     # Fetch Nextcloud app catalog (doesnt contain core app) for the future version
-    curl -s https://apps.nextcloud.com/api/v1/platform/$nextcloud_destination_appcatalog.0.0/apps.json | jq -r '.[] | .id' | sort > $nextcloud_destination_appcatalog
+    curl -s https://apps.nextcloud.com/api/v1/platform/$nextcloud_destination_version.0.0/apps.json | jq -r '.[] | .id' | sort > $nextcloud_destination_appcatalog
 
     # Compute set complement, cf https://catonmat.net/set-operations-in-unix-shell
     # We want to list the installed apps which are neither core apps nor in the destination catalog

From 94232f066de1820db236b71f7d9cd5d96834715e Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <4533074+alexAubin@users.noreply.github.com>
Date: Sun, 21 Jan 2024 17:45:01 +0100
Subject: [PATCH 09/21] Filter boring occ warnings during upgrade

---
 scripts/upgrade | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 715c330c..dfaf3893 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -34,6 +34,14 @@ fi
 current_version=$(grep OC_VersionString "$install_dir/version.php" | cut -d\' -f2)
 current_major_version=${current_version%%.*}
 
+filter_boring_occ_warnings() {
+    # Filter stupid and boring messages such as the progress bar looking like:
+    # 3/3 [============================] 100% Starting ...
+    # and being pretty much useless, as well as the annoying warning about "only a limited number of commands" etc...
+
+    sed -E 's@\s*([0-9]+\/[0-9]+\s+\[(-|>|=)+\]\s+[0-9]+%|\s*Starting ...|Nextcloud or one of the apps require upgrade - only a limited number of commands are available|You may use your browser or the occ upgrade command to do the upgrade)@@g'
+}
+
 # Define a function to execute commands with `occ`
 exec_occ() {
     # Backward compatibility to upgrade from older versions
@@ -59,7 +67,7 @@ exec_occ() {
         ynh_install_app_dependencies "$pkg_dependencies"
     fi 
 (cd "$install_dir" && ynh_exec_as "$app" \
-    php$NEXTCLOUD_PHP_VERSION --define apc.enable_cli=1 occ --no-interaction --no-ansi "$@")
+    php$NEXTCLOUD_PHP_VERSION --define apc.enable_cli=1 occ --no-interaction --no-ansi "$@") 2> >(filter_boring_occ_warnings >&2)
 }
 
 # Define a function to add an external storage

From c6d2e17c7762c333e08d0e30c3f2ee78365a9618 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <4533074+alexAubin@users.noreply.github.com>
Date: Sun, 21 Jan 2024 17:51:17 +0100
Subject: [PATCH 10/21] Fix PHP/APT dependency confusion when upgrading through
 many versions

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

diff --git a/scripts/upgrade b/scripts/upgrade
index 280eb7d0..582158c1 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -56,6 +56,10 @@ exec_occ() {
     if [[ "$NEXTCLOUD_PHP_VERSION" != "$phpversion" ]]; then
         local pkg_dependencies="$(dpkg-query --show --showformat='${Depends}' ${app}-ynh-deps)"
         pkg_dependencies="${pkg_dependencies//$phpversion/$NEXTCLOUD_PHP_VERSION}"
+        # Packaging v1 ~legacy : ynh_install_app_dependencies is designed to be called several times
+        # but the second time it will *append* the list of dependencies rather than replace the existing dependencies
+        # resulting in a crash when parsing what's the php version the app uses, hence we need to force the full-replacement
+        YNH_INSTALL_APP_DEPENDENCIES_REPLACE=true
         ynh_install_app_dependencies "$pkg_dependencies"
     fi 
 (cd "$install_dir" && ynh_exec_as "$app" \

From 7a1481de5a4d59818af451da9ae82e5af261333a Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Sun, 21 Jan 2024 19:03:37 +0100
Subject: [PATCH 11/21] Use new source format in manifest.toml + stop
 supporting upgrades from before 22.2

---
 manifest.toml                     | 34 +++++++++++++-
 scripts/install                   | 12 -----
 scripts/upgrade                   | 75 ++++++++++---------------------
 scripts/upgrade.d/upgrade.10.sh   |  7 ---
 scripts/upgrade.d/upgrade.11.sh   |  7 ---
 scripts/upgrade.d/upgrade.12.sh   |  7 ---
 scripts/upgrade.d/upgrade.13.sh   |  7 ---
 scripts/upgrade.d/upgrade.14.sh   |  7 ---
 scripts/upgrade.d/upgrade.15.sh   |  7 ---
 scripts/upgrade.d/upgrade.16.sh   |  7 ---
 scripts/upgrade.d/upgrade.17.sh   |  7 ---
 scripts/upgrade.d/upgrade.18.sh   |  7 ---
 scripts/upgrade.d/upgrade.19.sh   |  7 ---
 scripts/upgrade.d/upgrade.20.sh   |  7 ---
 scripts/upgrade.d/upgrade.21.sh   |  7 ---
 scripts/upgrade.d/upgrade.22.sh   |  7 ---
 scripts/upgrade.d/upgrade.23.sh   |  7 ---
 scripts/upgrade.d/upgrade.24.sh   |  7 ---
 scripts/upgrade.d/upgrade.25.sh   |  7 ---
 scripts/upgrade.d/upgrade.26.sh   |  7 ---
 scripts/upgrade.d/upgrade.27.sh   |  7 ---
 scripts/upgrade.d/upgrade.9.sh    |  7 ---
 scripts/upgrade.d/upgrade.last.sh |  7 ---
 23 files changed, 56 insertions(+), 205 deletions(-)
 delete mode 100755 scripts/upgrade.d/upgrade.10.sh
 delete mode 100755 scripts/upgrade.d/upgrade.11.sh
 delete mode 100755 scripts/upgrade.d/upgrade.12.sh
 delete mode 100644 scripts/upgrade.d/upgrade.13.sh
 delete mode 100755 scripts/upgrade.d/upgrade.14.sh
 delete mode 100644 scripts/upgrade.d/upgrade.15.sh
 delete mode 100755 scripts/upgrade.d/upgrade.16.sh
 delete mode 100755 scripts/upgrade.d/upgrade.17.sh
 delete mode 100644 scripts/upgrade.d/upgrade.18.sh
 delete mode 100644 scripts/upgrade.d/upgrade.19.sh
 delete mode 100644 scripts/upgrade.d/upgrade.20.sh
 delete mode 100644 scripts/upgrade.d/upgrade.21.sh
 delete mode 100644 scripts/upgrade.d/upgrade.22.sh
 delete mode 100644 scripts/upgrade.d/upgrade.23.sh
 delete mode 100644 scripts/upgrade.d/upgrade.24.sh
 delete mode 100644 scripts/upgrade.d/upgrade.25.sh
 delete mode 100644 scripts/upgrade.d/upgrade.26.sh
 delete mode 100644 scripts/upgrade.d/upgrade.27.sh
 delete mode 100755 scripts/upgrade.d/upgrade.9.sh
 delete mode 100644 scripts/upgrade.d/upgrade.last.sh

diff --git a/manifest.toml b/manifest.toml
index 79f0511e..7f457913 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -55,6 +55,38 @@ ram.runtime = "512M"
     default = false
 
 [resources]
+
+    [resources.sources]
+
+        [resources.sources.main]
+        url = 'https://download.nextcloud.com/server/releases/nextcloud-28.0.1.tar.bz2'
+        sha256 = '2f80735b443082272fe6a3b5e32137957f1fc448c75342b94b5200b29725f3a4'
+
+        [resources.sources.27]
+        url = 'https://download.nextcloud.com/server/releases/nextcloud-27.0.0.tar.bz2'
+        sha256 = '3d312a09b9345ac058758dd7b4059bf3cf0b1f0f1d747251b6fac3585ba6533f'
+        prefetch = false
+
+        [resources.sources.26]
+        url = 'https://download.nextcloud.com/server/releases/nextcloud-26.0.0.tar.bz2'
+        sha256 = 'f163150363aee9366ecb5cd5259bf6756ed4f073cea78b5fa515cada7a0d0c3d'
+        prefetch = false
+
+        [resources.sources.25]
+        url = 'https://download.nextcloud.com/server/releases/nextcloud-25.0.0.tar.bz2'
+        sha256 = '2c05ac9d7b72b44ef8b3d2ae03ff0fd6121e254b8054556f5163bd8760dd8f49'
+        prefetch = false
+
+        [resources.sources.24]
+        url = 'https://download.nextcloud.com/server/releases/nextcloud-24.0.0.tar.bz2'
+        sha256 = '176cb5620f20465fb4759bdf3caaebeb7acff39d6c8630351af9f8738c173780'
+        prefetch = false
+
+        [resources.sources.23]
+        url = 'https://download.nextcloud.com/server/releases/nextcloud-23.0.0.tar.bz2'
+        sha256 = 'c37592abc3b65c8fd28459281a24f414b87af52fc8c2ea979be3f9be75d01a2c'
+        prefetch = false
+
     [resources.system_user]
     allow_email = true
 
@@ -77,4 +109,4 @@ ram.runtime = "512M"
 
     [resources.database]
     type = "mysql"
-    
\ No newline at end of file
+    
diff --git a/scripts/install b/scripts/install
index 787641dc..dd662465 100755
--- a/scripts/install
+++ b/scripts/install
@@ -21,18 +21,6 @@ ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name \
 #=================================================
 ynh_script_progression --message="Setting up source files..." --weight=5
 
-# Load the last available version
-source upgrade.d/upgrade.last.sh
-
-# Create an app.src for the last version of nextcloud
-cat > ../conf/app.src << EOF
-SOURCE_URL=https://download.nextcloud.com/server/releases/nextcloud-$next_version.tar.bz2
-SOURCE_SUM=$nextcloud_source_sha256
-SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=tar.bz2
-SOURCE_IN_SUBDIR=true
-EOF
-
 # 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
diff --git a/scripts/upgrade b/scripts/upgrade
index 715c330c..fad65160 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -19,11 +19,12 @@ if [ -z "${phpflags:-}" ]; then
 	ynh_app_setting_set --app=$app --key=phpflags --value=$phpflags
 fi
 
-# Delete existing ini configuration file (backward compatibility)
-if [ -f /etc/php/$YNH_PHP_VERSION/fpm/conf.d/20-$app.ini ]; then
-    ynh_secure_remove --file=/etc/php/$YNH_PHP_VERSION/fpm/conf.d/20-$app.ini
+if ynh_compare_current_package_version --comparison lt --version 22.2
+then
+    ynh_die --message="Upgrading from Nextcloud < 22.2 is not supported anymore. You should first upgrade to 22.2 using: yunohost app upgrade nextcloud -u https://github.com/YunoHost-Apps/nextcloud_ynh/tree/41f5f902e7c7cd3c30a6793020562ba98b9bf3e9"
 fi
 
+
 #=================================================
 # SPECIFIC UPGRADE
 #=================================================
@@ -31,9 +32,6 @@ fi
 # VERSION TO THE NEXT ONE
 #=================================================
 
-current_version=$(grep OC_VersionString "$install_dir/version.php" | cut -d\' -f2)
-current_major_version=${current_version%%.*}
-
 # Define a function to execute commands with `occ`
 exec_occ() {
     # Backward compatibility to upgrade from older versions
@@ -43,21 +41,18 @@ exec_occ() {
     elif [ $current_major_version -ge 24 ]
     then
         NEXTCLOUD_PHP_VERSION="8.1"
-    elif [ $current_major_version -ge 18 ]
-    then
-        NEXTCLOUD_PHP_VERSION="7.4"
     else
-        NEXTCLOUD_PHP_VERSION="7.1"
+        NEXTCLOUD_PHP_VERSION="7.4"
     fi
 
-    # NB : be super careful when designing this part of the code, because calling ynh_install_app_dependencies 
+    # NB : be super careful when designing this part of the code, because calling ynh_install_app_dependencies
     # will do magic regarding php configuration and $phpversion when the php version of the dependencies changes ...
     phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
     if [[ "$NEXTCLOUD_PHP_VERSION" != "$phpversion" ]]; then
         local pkg_dependencies="$(dpkg-query --show --showformat='${Depends}' ${app}-ynh-deps)"
         pkg_dependencies="${pkg_dependencies//$phpversion/$NEXTCLOUD_PHP_VERSION}"
         ynh_install_app_dependencies "$pkg_dependencies"
-    fi 
+    fi
 (cd "$install_dir" && ynh_exec_as "$app" \
     php$NEXTCLOUD_PHP_VERSION --define apc.enable_cli=1 occ --no-interaction --no-ansi "$@")
 }
@@ -74,16 +69,16 @@ local mount_id=$(exec_occ files_external:create --output=json \
     || exec_occ files_external:option "$mount_id" enable_sharing true
 }
 
+current_version=$(grep OC_VersionString "$install_dir/version.php" | cut -d\' -f2)
+current_major_version=${current_version%%.*}
+
+last_version=$(ynh_read_manifest --key="resources.sources.main.url" | grep -o '[0-9][0-9]\.[0-9]\.[0-9]')
+last_major_version=${last_version%%.*}
+
 if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
     ynh_script_progression --message="Upgrading Nextcloud..." --weight=3
 
-    # Load the last available version
-    source upgrade.d/upgrade.last.sh
-    last_version=$next_version
-
-    last_major_version=${last_version%%.*}
-
     # Set write access for the following commands
     chown -R $app: "$install_dir" "$data_dir"
 
@@ -104,54 +99,30 @@ then
     # Take all apps enabled, and check if mail is one of them
     # Then temporary disable the mail app
     mail_app_must_be_reactived=0
-    
+
     if exec_occ app:list | awk '/Enabled/{f=1;next} /Disabled/{f=0} f' | grep -q -w mail; then
         exec_occ app:disable mail
         mail_app_must_be_reactived=1
     fi
-    
+
     # While the current version is not the last version, do an upgrade
     while [ "$last_version" != "$current_version" ]
     do
 
-        # The major version is the first part of the version number
-        current_major_version=${current_version%%.*}
+        ynh_print_info --message="Upgrade to Nextcloud $last_version"
 
-        if [ ! -f upgrade.d/upgrade.$current_major_version.sh ]; then
-            source upgrade.d/upgrade.last.sh
-        else
-            source upgrade.d/upgrade.$current_major_version.sh
-        fi
-
-        # If the current version has the same major version than the next one,
-        # then it's the last upgrade to do
-        # We also cover the case where the last version is the first of the current major version series
-        # (e.g. 20.0.0 is the latest version)
-        if [[ ("$last_major_version" -eq "$current_major_version") || ( ("$last_major_version" -eq "$((current_major_version+1))") && ("$next_version" == "$last_version") ) ]]; then
-            current_major_version=last
-            # Enable YunoHost patches on Nextcloud sources
+        next_major_version="$(( $current_major_version + 1 ))"
+        if [[ "$next_major_version" -ge "$last_major_version" ]]; then
             cp -a ../sources/patches_last_version/* ../sources/patches
+            source_id="main"
+        else
+            source_id="$next_major_version"
         fi
 
-        # Load the value for this version
-        source upgrade.d/upgrade.$current_major_version.sh
-
-        ynh_print_info --message="Upgrade to Nextcloud $next_version"
-
-        # Create an app.src for this version of Nextcloud
-        cat > ../conf/app.src << EOF
-SOURCE_URL=https://download.nextcloud.com/server/releases/nextcloud-$next_version.tar.bz2
-SOURCE_SUM=$nextcloud_source_sha256
-SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=tar.bz2
-SOURCE_IN_SUBDIR=true
-EOF
-
         # Create a temporary directory
         tmpdir="$(ynh_smart_mktemp min_size=300)"
 
-        # Install the next nextcloud version in $tmpdir
-        ynh_setup_source --dest_dir="$tmpdir"
+        ynh_setup_source --dest_dir="$tmpdir" --source_id="$source_id"
 
         # Backup the config file in the temp dir
         cp -a "$install_dir/config/config.php" "$tmpdir/config/config.php"
@@ -198,7 +169,7 @@ EOF
     exec_occ db:add-missing-columns -n
     exec_occ db:add-missing-primary-keys -n
     exec_occ db:convert-filecache-bigint -n
-    
+
     #=================================================
     # CONFIGURE NEXTCLOUD
     #=================================================
diff --git a/scripts/upgrade.d/upgrade.10.sh b/scripts/upgrade.d/upgrade.10.sh
deleted file mode 100755
index 508a4833..00000000
--- a/scripts/upgrade.d/upgrade.10.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-# Version cible de la mise à jour de Nextcloud
-next_version="11.0.0"
-
-# Nextcloud tarball checksum
-nextcloud_source_sha256="5bdfcb36c5cf470b9a6679034cabf88bf1e50a9f3e47c08d189cc2280b621429"
diff --git a/scripts/upgrade.d/upgrade.11.sh b/scripts/upgrade.d/upgrade.11.sh
deleted file mode 100755
index 9bbbe1d8..00000000
--- a/scripts/upgrade.d/upgrade.11.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-# Version cible de la mise à jour de Nextcloud
-next_version="12.0.0"
-
-# Nextcloud tarball checksum
-nextcloud_source_sha256="1b9d9cf05e657cd564a552b418fbf42d669ca51e0fd1f1f118fe44cbf93a243f"
diff --git a/scripts/upgrade.d/upgrade.12.sh b/scripts/upgrade.d/upgrade.12.sh
deleted file mode 100755
index 7069cc24..00000000
--- a/scripts/upgrade.d/upgrade.12.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-# Version cible de la mise à jour de Nextcloud
-next_version="13.0.0"
-
-# Nextcloud tarball checksum
-nextcloud_source_sha256="38e6064432a2d1a044f219028d3fd46cb7a943a47e11eef346810bd289705aec"
diff --git a/scripts/upgrade.d/upgrade.13.sh b/scripts/upgrade.d/upgrade.13.sh
deleted file mode 100644
index f979aa9e..00000000
--- a/scripts/upgrade.d/upgrade.13.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-# Last available nextcloud version
-next_version="14.0.0"
-
-# Nextcloud tarball checksum sha256
-nextcloud_source_sha256="f965c14286e7aabbfe49c947d86af59597af302c35d10e0b5440e7e6c53b8f47"
diff --git a/scripts/upgrade.d/upgrade.14.sh b/scripts/upgrade.d/upgrade.14.sh
deleted file mode 100755
index 8c5e80c8..00000000
--- a/scripts/upgrade.d/upgrade.14.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-# Last available nextcloud version
-next_version="15.0.0"
-
-# Nextcloud tarball checksum sha256
-nextcloud_source_sha256="5bb0c58171353da844019b64080c21078002a59ab956ab72adb958844a98eb78"
\ No newline at end of file
diff --git a/scripts/upgrade.d/upgrade.15.sh b/scripts/upgrade.d/upgrade.15.sh
deleted file mode 100644
index a8c2c1c2..00000000
--- a/scripts/upgrade.d/upgrade.15.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-# Last available nextcloud version
-next_version="16.0.0"
-
-# Nextcloud tarball checksum sha256
-nextcloud_source_sha256="4532f7028b1d9bf060f75ac4fbbde52a59ecd9c9155f3178a038d3cf3609402e"
diff --git a/scripts/upgrade.d/upgrade.16.sh b/scripts/upgrade.d/upgrade.16.sh
deleted file mode 100755
index cb0d88a2..00000000
--- a/scripts/upgrade.d/upgrade.16.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-# Last available nextcloud version
-next_version="17.0.0"
-
-# Nextcloud tarball checksum sha256
-nextcloud_source_sha256="6081421b33ecdb3130b2bfb2293a3f4045aeb0b471ee570e675de3d931a142a6"
diff --git a/scripts/upgrade.d/upgrade.17.sh b/scripts/upgrade.d/upgrade.17.sh
deleted file mode 100755
index 35200dad..00000000
--- a/scripts/upgrade.d/upgrade.17.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-# Last available nextcloud version
-next_version="18.0.0"
-
-# Nextcloud tarball checksum sha256
-nextcloud_source_sha256="194095a5586d84040bc455f77b8aa6c80f9a6a6dd713c9aebdad046713d4267b"
diff --git a/scripts/upgrade.d/upgrade.18.sh b/scripts/upgrade.d/upgrade.18.sh
deleted file mode 100644
index e43bb76a..00000000
--- a/scripts/upgrade.d/upgrade.18.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-# Last available nextcloud version
-next_version="19.0.0"
-
-# Nextcloud tarball checksum sha256
-nextcloud_source_sha256="d23d429657c5e3476d7e73af1eafc70e42a81cfe2ed65b20655a005724fe0aae"
diff --git a/scripts/upgrade.d/upgrade.19.sh b/scripts/upgrade.d/upgrade.19.sh
deleted file mode 100644
index c44f02b6..00000000
--- a/scripts/upgrade.d/upgrade.19.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-# Last available nextcloud version
-next_version="20.0.0"
-
-# Nextcloud tarball checksum sha256
-nextcloud_source_sha256="a273e0151f68567f729d9a82a7e3f124ff0f0471aa17bae6bfd83c5362d84cd8"
diff --git a/scripts/upgrade.d/upgrade.20.sh b/scripts/upgrade.d/upgrade.20.sh
deleted file mode 100644
index 01a1f943..00000000
--- a/scripts/upgrade.d/upgrade.20.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-# Last available nextcloud version
-next_version="21.0.0"
-
-# Nextcloud tarball checksum sha256
-nextcloud_source_sha256="ceadaeef67685a11afc5b23b0a86ba3c7bd0a7b138d5d1ecc05262383655f1f0"
diff --git a/scripts/upgrade.d/upgrade.21.sh b/scripts/upgrade.d/upgrade.21.sh
deleted file mode 100644
index 1be14353..00000000
--- a/scripts/upgrade.d/upgrade.21.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-# Last available nextcloud version
-next_version="22.2.10"
-
-# Nextcloud tarball checksum sha256
-nextcloud_source_sha256="8de167bfcfcaa661245a00a5ac36628e7961951b9fe2dfaf4f8a5aac6907ccdb"
diff --git a/scripts/upgrade.d/upgrade.22.sh b/scripts/upgrade.d/upgrade.22.sh
deleted file mode 100644
index 81844abf..00000000
--- a/scripts/upgrade.d/upgrade.22.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-# Last available Nextcloud version
-next_version="23.0.0"
-
-# Nextcloud tarball checksum sha256
-nextcloud_source_sha256="c37592abc3b65c8fd28459281a24f414b87af52fc8c2ea979be3f9be75d01a2c"
diff --git a/scripts/upgrade.d/upgrade.23.sh b/scripts/upgrade.d/upgrade.23.sh
deleted file mode 100644
index eb2b944e..00000000
--- a/scripts/upgrade.d/upgrade.23.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-# Last available Nextcloud version
-next_version="24.0.0"
-
-# Nextcloud tarball checksum sha256
-nextcloud_source_sha256="176cb5620f20465fb4759bdf3caaebeb7acff39d6c8630351af9f8738c173780"
diff --git a/scripts/upgrade.d/upgrade.24.sh b/scripts/upgrade.d/upgrade.24.sh
deleted file mode 100644
index 658c57dd..00000000
--- a/scripts/upgrade.d/upgrade.24.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-# Last available Nextcloud version
-next_version="25.0.0"
-
-# Nextcloud tarball checksum sha256
-nextcloud_source_sha256="2c05ac9d7b72b44ef8b3d2ae03ff0fd6121e254b8054556f5163bd8760dd8f49"
diff --git a/scripts/upgrade.d/upgrade.25.sh b/scripts/upgrade.d/upgrade.25.sh
deleted file mode 100644
index fedd8f19..00000000
--- a/scripts/upgrade.d/upgrade.25.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-# Last available Nextcloud version
-next_version="26.0.0"
-
-# Nextcloud tarball checksum sha256
-nextcloud_source_sha256="f163150363aee9366ecb5cd5259bf6756ed4f073cea78b5fa515cada7a0d0c3d"
diff --git a/scripts/upgrade.d/upgrade.26.sh b/scripts/upgrade.d/upgrade.26.sh
deleted file mode 100644
index 59b4622b..00000000
--- a/scripts/upgrade.d/upgrade.26.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-# Last available Nextcloud version
-next_version="27.0.0"
-
-# Nextcloud tarball checksum sha256
-nextcloud_source_sha256="3d312a09b9345ac058758dd7b4059bf3cf0b1f0f1d747251b6fac3585ba6533f"
diff --git a/scripts/upgrade.d/upgrade.27.sh b/scripts/upgrade.d/upgrade.27.sh
deleted file mode 100644
index 3716a7f2..00000000
--- a/scripts/upgrade.d/upgrade.27.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-# Last available Nextcloud version
-next_version="28.0.0"
-
-# Nextcloud tarball checksum sha256
-nextcloud_source_sha256="4e8b0b74b40221e85f92ab869d0873c69a52d7e43889d9259c6259428a6a36f2"
diff --git a/scripts/upgrade.d/upgrade.9.sh b/scripts/upgrade.d/upgrade.9.sh
deleted file mode 100755
index 2d1c59e1..00000000
--- a/scripts/upgrade.d/upgrade.9.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-# Version cible de la mise à jour de Nextcloud
-next_version="10.0.2"
-
-# Nextcloud tarball checksum
-nextcloud_source_sha256="a687a818778413484f06bb23b4e98589c73729fe2aa9feb1bf5584e3bd37103c"
diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh
deleted file mode 100644
index 067e91bf..00000000
--- a/scripts/upgrade.d/upgrade.last.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-# Last available Nextcloud version
-next_version="28.0.1"
-
-# Nextcloud tarball checksum sha256
-nextcloud_source_sha256="2f80735b443082272fe6a3b5e32137957f1fc448c75342b94b5200b29725f3a4"

From a0c4d0c17234c31f670b068a57e395b4abd33d46 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <4533074+alexAubin@users.noreply.github.com>
Date: Sun, 21 Jan 2024 20:58:00 +0100
Subject: [PATCH 12/21] Update upgrade

---
 scripts/upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index fad65160..546d0d55 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -19,7 +19,7 @@ if [ -z "${phpflags:-}" ]; then
 	ynh_app_setting_set --app=$app --key=phpflags --value=$phpflags
 fi
 
-if ynh_compare_current_package_version --comparison lt --version 22.2
+if ynh_compare_current_package_version --comparison lt --version 22.2~ynh1
 then
     ynh_die --message="Upgrading from Nextcloud < 22.2 is not supported anymore. You should first upgrade to 22.2 using: yunohost app upgrade nextcloud -u https://github.com/YunoHost-Apps/nextcloud_ynh/tree/41f5f902e7c7cd3c30a6793020562ba98b9bf3e9"
 fi

From 3ee53e775bd0c24a144d13be796a760f460660bb Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <4533074+alexAubin@users.noreply.github.com>
Date: Sun, 21 Jan 2024 21:58:43 +0100
Subject: [PATCH 13/21] Update upgrade: typo in helper doc >_>

---
 scripts/upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 546d0d55..35048d4a 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -72,7 +72,7 @@ local mount_id=$(exec_occ files_external:create --output=json \
 current_version=$(grep OC_VersionString "$install_dir/version.php" | cut -d\' -f2)
 current_major_version=${current_version%%.*}
 
-last_version=$(ynh_read_manifest --key="resources.sources.main.url" | grep -o '[0-9][0-9]\.[0-9]\.[0-9]')
+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 [ "$upgrade_type" == "UPGRADE_APP" ]

From fc131c1b3b8d97981a02397c961dd68bd5cdb390 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <4533074+alexAubin@users.noreply.github.com>
Date: Thu, 25 Jan 2024 17:24:15 +0100
Subject: [PATCH 14/21] Update upgrade: fix boring bug because of apt install
 piped into jq

---
 scripts/upgrade | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/upgrade b/scripts/upgrade
index fc5495f3..ab3ab3a8 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -89,6 +89,9 @@ function list_installed_apps_not_compatible_with_future_version()
     local core_apps_in_current_version=$(mktemp)
     local nextcloud_destination_appcatalog=$(mktemp)
 
+    # Run a first "dummy" command just to make sure we have the appropriate php dependencies installed,
+    # otherwise this creates funky stuff when tweaking the apt deps because the next command is piped into jq ...
+    exec_occ -V
     # List installed apps
     exec_occ app:list --output json | jq -r ".enabled | keys[]" | sort > $installed_apps
     # Fetch Nextcloud list of core apps from their github repo for the current version

From 12b88c27480f2f0cf7501de7491c36e5483b25ed Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <4533074+alexAubin@users.noreply.github.com>
Date: Thu, 25 Jan 2024 19:12:47 +0100
Subject: [PATCH 15/21] Update upgrade: zgrompf

---
 scripts/upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index ab3ab3a8..0329abfa 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -91,7 +91,7 @@ function list_installed_apps_not_compatible_with_future_version()
 
     # Run a first "dummy" command just to make sure we have the appropriate php dependencies installed,
     # otherwise this creates funky stuff when tweaking the apt deps because the next command is piped into jq ...
-    exec_occ -V
+    exec_occ -V >/dev/null
     # List installed apps
     exec_occ app:list --output json | jq -r ".enabled | keys[]" | sort > $installed_apps
     # Fetch Nextcloud list of core apps from their github repo for the current version

From 2891edce520075266b9ff401ca3829cac8c18a17 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <4533074+alexAubin@users.noreply.github.com>
Date: Thu, 25 Jan 2024 19:22:25 +0100
Subject: [PATCH 16/21] Update PRE_UPGRADE.md

---
 doc/PRE_UPGRADE.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/PRE_UPGRADE.md b/doc/PRE_UPGRADE.md
index 58e7dc24..663bc771 100644
--- a/doc/PRE_UPGRADE.md
+++ b/doc/PRE_UPGRADE.md
@@ -1 +1,3 @@
 If you are upgrading to a new major version of Nextcloud, please make sure that your Nextcloud apps are up to date from Nextcloud's administration panel beforehand.
+
+Additionally, if you installed specific Nextcloud apps, we recommend making sure that they are compatible with the new major version. YunoHost will attempt to check this automatically at the very beginning of the upgrade, but a manual check doesn't hurt either. For Nextcloud 28, this forum thread might be helpful : <https://help.nextcloud.com/t/apps-not-compatible-with-nc-28/176234>.

From 625281f6e3b1a9828a8bff244672ee26efaa2d62 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <4533074+alexAubin@users.noreply.github.com>
Date: Thu, 25 Jan 2024 21:18:08 +0100
Subject: [PATCH 17/21] Update change_url, indicate it's a workaround for a
 core issue

---
 scripts/change_url | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/change_url b/scripts/change_url
index 4ba48b33..aac12f0f 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -54,7 +54,7 @@ fi
 #=================================================
 ynh_script_progression --message="Configuring permissions..."
 
-# Temporary fix for the API permission
+# Temporary fix for the API permission (workaround for https://github.com/YunoHost/issues/issues/2294 )
 ynh_permission_url --permission="api" --url="re:$new_domain\/.well-known\/.*" --auth_header="false" --clear_urls
 
 #=================================================

From c4d5a7dd87a05e2c27ed849562dc6c71039f59e3 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Thu, 25 Jan 2024 22:11:22 +0100
Subject: [PATCH 18/21] Unecessary ynh_secure_remove because of previous mv ...

---
 scripts/upgrade | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 0329abfa..6c0d6a01 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -192,7 +192,6 @@ then
         # Replace the old Nextcloud by the new one
         ynh_secure_remove --file="$install_dir"
         mv "$tmpdir" "$install_dir"
-        ynh_secure_remove --file="$tmpdir"
 
         # Set write access for the following commands
         chown -R $app: "$install_dir" "$data_dir"

From bab75661c17cf32c28dc75a1a2417ee3ccc2d1b3 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Thu, 25 Jan 2024 22:13:39 +0100
Subject: [PATCH 19/21] Fix incorrect 'upgrade to nextcloud X.Y' message

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

diff --git a/scripts/upgrade b/scripts/upgrade
index 6c0d6a01..19bc27df 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -154,13 +154,13 @@ then
     while [ "$last_version" != "$current_version" ]
     do
 
-        ynh_print_info --message="Upgrade to Nextcloud $last_version"
-
         next_major_version="$(( $current_major_version + 1 ))"
         if [[ "$next_major_version" -ge "$last_major_version" ]]; then
+            ynh_print_info --message="Upgrading to Nextcloud $last_version"
             cp -a ../sources/patches_last_version/* ../sources/patches
             source_id="main"
         else
+            ynh_print_info --message="Upgrading to Nextcloud $next_major_version"
             source_id="$next_major_version"
         fi
 

From ff2472533f8f1c94aad1d65a65798cb82cc80965 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <4533074+alexAubin@users.noreply.github.com>
Date: Sun, 28 Jan 2024 02:21:54 +0100
Subject: [PATCH 20/21] Update manifest.toml: bump version

---
 manifest.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.toml b/manifest.toml
index 7f457913..8cdbdad7 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -5,7 +5,7 @@ name = "Nextcloud"
 description.en = "Online storage, file sharing platform and various other applications"
 description.fr = "Stockage en ligne, plateforme de partage de fichiers et diverses autres applications"
 
-version = "28.0.1~ynh1"
+version = "28.0.1~ynh2"
 
 maintainers = ["kay0u"]
 

From 63f4a43f75f290d61c38d503a4fd3cfc2adabb06 Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Sun, 28 Jan 2024 01:21:58 +0000
Subject: [PATCH 21/21] Auto-update README

---
 README.md    | 2 +-
 README_fr.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 5b8a14bf..b463ddc1 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ In addition to Nextcloud core features, the following are made available with th
  * Serve `/.well-known` paths for CalDAV and CardDAV on the domain only if it's not already served - i.e. by Baïkal
 
 
-**Shipped version:** 28.0.1~ynh1
+**Shipped version:** 28.0.1~ynh2
 
 **Demo:** https://demo.nextcloud.com/
 
diff --git a/README_fr.md b/README_fr.md
index 8b6334cc..01f21b00 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -29,7 +29,7 @@ En plus des fonctionnalités principales de Nextcloud, les fonctionnalités suiv
  * Utilise l'adresse `/.well-known` pour la synchronisation CalDAV et CardDAV du domaine si aucun autre service ne l'utilise déjà - par exemple, Baïkal
 
 
-**Version incluse :** 28.0.1~ynh1
+**Version incluse :** 28.0.1~ynh2
 
 **Démo :** https://demo.nextcloud.com/