From 90000f5ba5a2de2bb2fcea7460f4cd88006ba6a6 Mon Sep 17 00:00:00 2001 From: Gofannon <17145502+Gofannon@users.noreply.github.com> Date: Wed, 29 Jun 2022 20:19:13 +0200 Subject: [PATCH] Use YNH_PHP_VERSION as it seems the way to go --- scripts/_common.sh | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 0252dca..c7f5ba5 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,21 +6,28 @@ # Overload "default php" version to bypass package limitation not ready to use 7.4 yet (version 2.4.0 minimun. See https://github.com/wallabag/wallabag/blob/master/CHANGELOG.md#240) # Fallback to php 7.3 as on debian 11 / bulleyes, 7.4 is used by default -YNH_DEFAULT_PHP_VERSION=7.3 +YNH_PHP_VERSION=7.3 # dependencies used by the app pkg_dependencies=" -php$YNH_DEFAULT_PHP_VERSION-cli -php$YNH_DEFAULT_PHP_VERSION-mysql -php$YNH_DEFAULT_PHP_VERSION-json -php$YNH_DEFAULT_PHP_VERSION-gd -php$YNH_DEFAULT_PHP_VERSION-tidy -php$YNH_DEFAULT_PHP_VERSION-curl -php$YNH_DEFAULT_PHP_VERSION-gettext -php$YNH_DEFAULT_PHP_VERSION-redis -php$YNH_DEFAULT_PHP_VERSION-common +php$YNH_PHP_VERSION-cli +php$YNH_PHP_VERSION-mysql +php$YNH_PHP_VERSION-json +php$YNH_PHP_VERSION-gd +php$YNH_PHP_VERSION-tidy +php$YNH_PHP_VERSION-curl +php$YNH_PHP_VERSION-gettext +php$YNH_PHP_VERSION-redis +php$YNH_PHP_VERSION-common " +### sources for php version overload: +# https://github.com/YunoHost-Apps/wallabag2_ynh/pull/128#pullrequestreview-986708050= +# https://github.com/YunoHost-Apps/grav_ynh/blob/testing/scripts/_common.sh +# https://github.com/YunoHost/example_ynh/blob/master/scripts/_common.sh +# https://github.com/YunoHost/yunohost/blob/dev/helpers/php#L3-L6= +### + #================================================= # PERSONAL HELPERS #=================================================