1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/matomo_ynh.git synced 2024-09-03 19:45:56 +02:00
* upgrade: gotta upgrade apt dependencies *before* calling core:update, because it needs the appropriate php version
This commit is contained in:
Alexandre Aubin 2022-02-08 18:48:02 +01:00 committed by GitHub
parent c0c31ccba2
commit ad886c09c6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 20 deletions

View file

@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
Open source analytics platform for measuring Web statistics Open source analytics platform for measuring Web statistics
**Shipped version:** 4.7.1~ynh1 **Shipped version:** 4.7.1~ynh2
**Demo:** https://demo.matomo.org **Demo:** https://demo.matomo.org

View file

@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
Plateforme d'analyse open source de mesure de statistiques Web Plateforme d'analyse open source de mesure de statistiques Web
**Version incluse :** 4.7.1~ynh1 **Version incluse :** 4.7.1~ynh2
**Démo :** https://demo.matomo.org **Démo :** https://demo.matomo.org

BIN
doc/.DS_Store vendored

Binary file not shown.

View file

@ -6,7 +6,7 @@
"en": "Open source analytics platform for measuring Web statistics", "en": "Open source analytics platform for measuring Web statistics",
"fr": "Plateforme d'analyse open source de mesure de statistiques Web" "fr": "Plateforme d'analyse open source de mesure de statistiques Web"
}, },
"version": "4.7.1~ynh1", "version": "4.7.1~ynh2",
"url": "https://matomo.org", "url": "https://matomo.org",
"upstream": { "upstream": {
"license": "GPL-3.0-or-later", "license": "GPL-3.0-or-later",

View file

@ -98,6 +98,14 @@ ynh_system_user_create --username=$app --home_dir="$final_path"
#================================================= #=================================================
# STANDARD UPGRADE STEPS # STANDARD UPGRADE STEPS
#=================================================
#=================================================
# UPGRADE DEPENDENCIES
#=================================================
ynh_script_progression --message="Upgrading dependencies..." --weight=1
ynh_install_app_dependencies $pkg_dependencies
#================================================= #=================================================
# DOWNLOAD, CHECK AND UNPACK SOURCE # DOWNLOAD, CHECK AND UNPACK SOURCE
#================================================= #=================================================
@ -112,17 +120,8 @@ then
# This condition is only for CI test to go through the upgrade process # This condition is only for CI test to go through the upgrade process
ynh_setup_source --dest_dir="$final_path" ynh_setup_source --dest_dir="$final_path"
else else
# Create a temporary directory
tmpdir="$(mktemp -d)"
cp -a "$final_path/config/config.ini.php" "$tmpdir/config.ini.php"
# Remove the app directory securely
ynh_secure_remove --file=$final_path
# Download, check integrity, uncompress and patch the source from app.src # Download, check integrity, uncompress and patch the source from app.src
ynh_setup_source --dest_dir="$final_path" ynh_setup_source --dest_dir="$final_path" --keep="$final_path/config/config.ini.php"
cp -a "$tmpdir/config.ini.php" "$final_path/config/config.ini.php"
# Remove the tmp directory securely
ynh_secure_remove --file="$tmpdir"
chown -R $app:www-data "$final_path" chown -R $app:www-data "$final_path"
ynh_exec_as $app php${phpversion} $final_path/console core:update -n ynh_exec_as $app php${phpversion} $final_path/console core:update -n
@ -141,13 +140,6 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." -
# Create a dedicated NGINX config # Create a dedicated NGINX config
ynh_add_nginx_config ynh_add_nginx_config
#=================================================
# UPGRADE DEPENDENCIES
#=================================================
ynh_script_progression --message="Upgrading dependencies..." --weight=1
ynh_install_app_dependencies $pkg_dependencies
#================================================= #=================================================
# PHP-FPM CONFIGURATION # PHP-FPM CONFIGURATION
#================================================= #=================================================