diff --git a/README.md b/README.md index 0a2cee7..6498ffc 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Collabora Online is a powerful LibreOffice-based online office that supports all - presentations (odp, pptx, ppt…) -**Shipped version:** 21.11.0.6~ynh1 +**Shipped version:** 21.11.4.1~ynh1 diff --git a/README_fr.md b/README_fr.md index 2cb5c9b..44c837f 100644 --- a/README_fr.md +++ b/README_fr.md @@ -23,7 +23,7 @@ Collabora Online est une suite bureautique en ligne open source basé sur LibreO - des tableurs (ods, xlsx, xls…) - présentations (odp, pptx, ppt…) -**Version incluse :** 21.11.0.6~ynh1 +**Version incluse :** 21.11.4.1~ynh1 diff --git a/manifest.json b/manifest.json index d7e2d1e..0cec0ce 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "LibreOffice-based online office suite with collaborative editing", "fr": "Suite office en ligne et collaborative, basée sur LibreOffice" }, - "version": "21.11.0.6~ynh1", + "version": "21.11.4.1~ynh1", "url": "https://collaboraoffice.com", "upstream": { "license": "MPL-2.0", diff --git a/scripts/restore b/scripts/restore index 5bf710d..dbf3f14 100644 --- a/scripts/restore +++ b/scripts/restore @@ -30,14 +30,6 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) -#================================================= -# CHECK IF THE APP CAN BE RESTORED -#================================================= -ynh_script_progression --message="Validating restoration parameters..." --weight=1 - -ynh_webpath_available --domain=$domain --path_url=$path_url \ - || ynh_die --message="Path not available: ${domain}${path_url}" - #================================================= # STANDARD RESTORATION STEPS #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 48e752b..78a4120 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -27,6 +27,11 @@ nextcloud_domain=$(ynh_app_setting_get --app="$app" --key=nextcloud_domain) #================================================= ynh_script_progression --message="Ensuring downward compatibility..." --weight=2 +if ynh_compare_current_package_version --comparison le --version 6.4.10~ynh2 +then + ynh_die --message="Upgrade from version 6.4.10 is not possible. You must uninstall and reinstall Collabora package manually" +fi + # If db_name doesn't exist, create it if [ -z "$path_url" ]; then path_url="/"