From 78fa567b9c5f8d8009c9192fd566448f9c3e46da Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 23 Nov 2020 22:19:11 +0100 Subject: [PATCH 1/3] Upgrade to 4.0.0 --- README.md | 2 +- check_process | 2 -- conf/app.src | 4 ++-- manifest.json | 4 ++-- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 001d7a1..2e3a191 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Matomo is the only analytics platform that gives you full control over your data - Easy to use - No data limits -**Shipped version:** 3.14.1 +**Shipped version:** 4.0.0 ## Screenshots diff --git a/check_process b/check_process index 8d1f114..5fa2ce3 100644 --- a/check_process +++ b/check_process @@ -19,8 +19,6 @@ upgrade=1 from_commit=1d3e9f3dbf72a6a124c879fa549ab8107367e36a backup_restore=1 multi_instance=1 - # This test is no longer necessary since the version 2.7 (PR: https://github.com/YunoHost/yunohost/pull/304), you can still do it if your app could be installed with this version. - # incorrect_path=1 port_already_use=0 change_url=0 ;;; Levels diff --git a/conf/app.src b/conf/app.src index 9e0b24a..0b449bb 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/matomo-org/matomo/archive/3.14.1.tar.gz -SOURCE_SUM=73d7fed246860494c6f7242cee3fb829abfff36531f5ae5e39f862d68fe3c404 +SOURCE_URL=https://github.com/matomo-org/matomo/archive/4.0.0.tar.gz +SOURCE_SUM=a58df7c73817926298fbeb41f3435c07fed5e4bd84a078a5b35be48914d5945f SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 69534b0..df17ae4 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Open source analytics platform for measuring Web statistics", "fr": "Plateforme d'analyse open source de mesure de statistiques Web" }, - "version": "3.14.1~ynh1", + "version": "4.0.0~ynh1", "url": "https://matomo.org", "license": "GPL-3.0-or-later", "maintainer": { @@ -14,7 +14,7 @@ "email": "anmol@datamol.org" }, "requirements": { - "yunohost": ">= 3.8" + "yunohost": ">= 4.0.0" }, "multi_instance": true, "services": [ From 967848f416e1da9668aa5d48cb62929d672f3c83 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 27 Nov 2020 08:57:17 +0100 Subject: [PATCH 2/3] upgrade to v.4.0.1 --- README.md | 2 +- conf/app.src | 4 ++-- manifest.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 2e3a191..9402d4c 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Matomo is the only analytics platform that gives you full control over your data - Easy to use - No data limits -**Shipped version:** 4.0.0 +**Shipped version:** 4.0.1 ## Screenshots diff --git a/conf/app.src b/conf/app.src index 0b449bb..ab5a194 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/matomo-org/matomo/archive/4.0.0.tar.gz -SOURCE_SUM=a58df7c73817926298fbeb41f3435c07fed5e4bd84a078a5b35be48914d5945f +SOURCE_URL=https://github.com/matomo-org/matomo/archive/4.0.1.tar.gz +SOURCE_SUM=ef087588e7e02f8f10b00721a55c4ab4679c604ce299a563502079abc760bc22 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index df17ae4..32fea1b 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Open source analytics platform for measuring Web statistics", "fr": "Plateforme d'analyse open source de mesure de statistiques Web" }, - "version": "4.0.0~ynh1", + "version": "4.0.1~ynh1", "url": "https://matomo.org", "license": "GPL-3.0-or-later", "maintainer": { From 0b7434999835723c7bf3b8092a913c32cfe0a7f6 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 6 Dec 2020 12:05:37 +0100 Subject: [PATCH 3/3] Fix linter warning --- scripts/install | 6 +++--- scripts/upgrade | 7 ------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/scripts/install b/scripts/install index 1a60ac6..9b6a67b 100755 --- a/scripts/install +++ b/scripts/install @@ -106,9 +106,9 @@ ynh_install_composer --phpversion="$phpversion" --workdir="$final_path" ynh_script_progression --message="Setuping a cron..." ynh_replace_string --match_string="YNH_WWW_PATH" --replace_string="$final_path" --target_file="../conf/cron" -ynh_replace_string --match_string="__USER__" --replace_string="$app" --target_file="../conf/cron" -ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="../conf/cron" -ynh_replace_string --match_string="__PATH__" --replace_string="$path_url" --target_file="../conf/cron" +ynh_replace_string --match_string="__USER__" --replace_string="$app" --target_file="../conf/cron" +ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="../conf/cron" +ynh_replace_string --match_string="__PATH__" --replace_string="$path_url" --target_file="../conf/cron" cp -f ../conf/cron /etc/cron.d/$app #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 4b1b4d4..f929638 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -70,13 +70,6 @@ ynh_clean_setup () { # Exit if an error occurs during the execution of the script ynh_abort_if_errors -#================================================= -# CHECK THE PATH -#================================================= - -# Normalize the URL path syntax -path_url=$(ynh_normalize_url_path --path_url=$path_url) - #================================================= # STANDARD UPGRADE STEPS #=================================================