diff --git a/README.md b/README.md index b892592..468c839 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:** 29.0.2~ynh1 +**Shipped version:** 29.0.2~ynh2 **Demo:** diff --git a/README_es.md b/README_es.md index 3ed8bc1..b90a3d8 100644 --- a/README_es.md +++ b/README_es.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 -**Versión actual:** 29.0.2~ynh1 +**Versión actual:** 29.0.2~ynh2 **Demo:** diff --git a/README_eu.md b/README_eu.md index e1df5a3..40b4c1a 100644 --- a/README_eu.md +++ b/README_eu.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 -**Paketatutako bertsioa:** 29.0.2~ynh1 +**Paketatutako bertsioa:** 29.0.2~ynh2 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 0bb2d4d..80de7d9 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 :** 29.0.2~ynh1 +**Version incluse :** 29.0.2~ynh2 **Démo :** diff --git a/README_gl.md b/README_gl.md index bbd9686..387f988 100644 --- a/README_gl.md +++ b/README_gl.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 -**Versión proporcionada:** 29.0.2~ynh1 +**Versión proporcionada:** 29.0.2~ynh2 **Demo:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index d97e0ed..3a6e398 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.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 -**分发版本:** 29.0.2~ynh1 +**分发版本:** 29.0.2~ynh2 **演示:** diff --git a/manifest.toml b/manifest.toml index bd57e9f..9d7176c 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 = "29.0.2~ynh1" +version = "29.0.2~ynh2" maintainers = ["kay0u"] diff --git a/scripts/upgrade b/scripts/upgrade index 63fb3ef..2821d65 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -13,11 +13,8 @@ ynh_script_progression --message="Ensuring downward compatibility..." # Remove the option backup_core_only if it's in the settings.yml file ynh_app_setting_delete --app=$app --key=backup_core_only -# If phpflags doesn't exist, create it -if [ -z "${phpflags:-}" ]; then - phpflags="--define apc.enable_cli=1" - ynh_app_setting_set --app=$app --key=phpflags --value="$phpflags" -fi +phpflags="--define apc.enable_cli=1" +ynh_app_setting_set --app=$app --key=phpflags --value="$phpflags" if ynh_compare_current_package_version --comparison lt --version 22.2~ynh1 then @@ -45,7 +42,10 @@ current_major_version=${current_version%%.*} # Define a function to execute commands with `occ` exec_occ() { # Backward compatibility to upgrade from older versions - if [ $current_major_version = "last" ] || [ $current_major_version -ge 26 ] + if [ $current_major_version = "last" ] + then + NEXTCLOUD_PHP_VERSION="8.3" + elif [ $current_major_version -ge 26 ] then NEXTCLOUD_PHP_VERSION="8.2" elif [ $current_major_version -ge 24 ] diff --git a/tests.toml b/tests.toml index bc75dbb..eb4b363 100644 --- a/tests.toml +++ b/tests.toml @@ -9,4 +9,4 @@ test_format = 1.0 test_upgrade_from.c5cf91ad.name = "Upgrade from 25.0.2" test_upgrade_from.caf917f3.name = "Upgrade from 26.0.2" test_upgrade_from.9c6d1eea.name = "Upgrade from 27.1.4" - test_upgrade_from.3e60bacf.name = "Upgrade from 28.0.1" + test_upgrade_from.e9f82ab7.name = "Upgrade from 28.0.6"