From c1d716aea9ebff85a84fefa35be26810c1b7b130 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 6 Jan 2021 09:28:00 +0100 Subject: [PATCH] Upgrade to 4.1.0 (#27) * Upgrade to 4.1.0 --- README.md | 2 +- README_fr.md | 4 ++-- conf/app.src | 4 ++-- manifest.json | 2 +- scripts/install | 2 +- scripts/restore | 2 +- scripts/upgrade | 7 +++---- 7 files changed, 11 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 5343f38..1d31a0a 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview Matomo is the leading Free/Libre open analytics platform. It is a full-featured PHP MySQL software program that you download and install on your own webserver. At the end of the five-minute installation process, you will be given a JavaScript code. Simply copy and paste this tag on websites you wish to track and access your analytics reports in real-time. -**Shipped version:** 4.0.5 +**Shipped version:** 4.1.0 ## Screenshots diff --git a/README_fr.md b/README_fr.md index c8c5f56..85793c6 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,7 +1,7 @@ # Matomo pour YunoHost [![Niveau d'intégration](https://dash.yunohost.org/integration/matomo.svg)](https://dash.yunohost.org/appci/app/matomo) ![](https://ci-apps.yunohost.org/ci/badges/matomo.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/matomo.maintain.svg) -[![Installer Matomo avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=matomo) +[![Installer Matomo avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=matomo) *[Read this readme in english.](./README.md)* @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install ## Vue d'ensemble Matomo est une plateforme d'analyse open source de mesure de statistiques Web. Il s'agit d'un logiciel PHP MySQL complet que vous téléchargez et installez sur votre propre serveur Web. À la fin du processus d'installation de cinq minutes, vous recevrez un code JavaScript. Copiez et collez simplement cette balise sur les sites Web que vous souhaitez suivre et accédez à vos rapports d'analyse en temps réel. -**Version incluse :** 4.0.5 +**Version incluse :** 4.1.0 ## Captures d'écran diff --git a/conf/app.src b/conf/app.src index 2f64345..31bd2bb 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/matomo-org/matomo/archive/4.0.5.tar.gz -SOURCE_SUM=b201dbcf0ce87433a6509cb83c7e565fed2da9a88f192ab222367e74ee28d55a +SOURCE_URL=https://github.com/matomo-org/matomo/archive/4.1.0.tar.gz +SOURCE_SUM=13b74fffbe794b8de3da46e91485a5a5c71c8f0267d0db80e88889db8a44aa03 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 7f5a27d..8185c36 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.5~ynh2", + "version": "4.1.0~ynh1", "url": "https://matomo.org", "license": "GPL-3.0-or-later", "maintainer": { diff --git a/scripts/install b/scripts/install index 9e41513..192b249 100755 --- a/scripts/install +++ b/scripts/install @@ -125,7 +125,7 @@ ynh_replace_string --match_string="__PHPVERSION__" --replace_string="$phpversion ynh_script_progression --message="Securing files and directories..." # Set permissions to app files -chown -R $app: $final_path +chown -R $app:$app $final_path #================================================= # SETUP SSOWAT diff --git a/scripts/restore b/scripts/restore index 4a51b1d..5b97f86 100755 --- a/scripts/restore +++ b/scripts/restore @@ -71,7 +71,7 @@ ynh_system_user_create --username=$app ynh_script_progression --message="Restoring user rights..." # Restore permissions on app files -chown -R $app: $final_path +chown -R $app:$app $final_path #================================================= # RESTORE THE PHP-FPM CONFIGURATION diff --git a/scripts/upgrade b/scripts/upgrade index bddff85..3c9f6bd 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -143,9 +143,7 @@ ynh_script_progression --message="Installating composer and dependencies..." ynh_install_composer --phpversion="$phpversion" --workdir="$final_path" if [[ -f "$final_path/config/config.ini.php" ]]; then - pushd "$final_path" - ynh_exec_as $app ./console core:update - popd + php$phpversion $final_path/console core:update fi #================================================= @@ -154,6 +152,7 @@ fi if [ ! "$(ls -A "$final_path/plugins/Morpheus/icons")" ] then + ynh_script_progression --message="Installating Morpheus icons..." ynh_setup_source --dest_dir="$final_path/plugins/Morpheus/icons" --source_id="icons" chmod -R 755 "$final_path/plugins/Morpheus" fi @@ -179,7 +178,7 @@ ynh_replace_string --match_string="__PHPVERSION__" --replace_string="$phpversion ynh_script_progression --message="Securing files and directories..." # Set permissions on app files -chown -R $app: $final_path +chown -R $app:$app $final_path #================================================= # RELOAD NGINX