From 9dbf626b36d6ff401d15c39bf721fceaeb2aeed1 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 9 Mar 2020 20:36:44 +0100 Subject: [PATCH] [php] More ugly hack for php helpers shipped by apps that assume php 7.0 by default --- src/yunohost/app.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/yunohost/app.py b/src/yunohost/app.py index 56574acf6..8faf587ff 100644 --- a/src/yunohost/app.py +++ b/src/yunohost/app.py @@ -2879,7 +2879,9 @@ LEGACY_PHP_VERSION_REPLACEMENTS = [ ("/var/run/php5-fpm", "/var/run/php/php7.3-fpm"), ("/var/run/php/php7.0-fpm", "/var/run/php/php7.3-fpm"), ("php5", "php7.3"), - ("php7.0", "php7.3") + ("php7.0", "php7.3"), + ('phpversion="${phpversion:-7.0}"', 'phpversion="${phpversion:-7.3}"'), # Many helpers like the composer ones use 7.0 by default ... + ('"$phpversion" == "7.0"', '$(bc <<< "$phpversion >= 7.3") -eq 1') # patch ynh_install_php to refuse installing/removing php <= 7.3 ] def _patch_legacy_php_versions(app_folder):