From 3959e3783927564ac1bac7dfe65ca097572f7cd5 Mon Sep 17 00:00:00 2001 From: chris Date: Wed, 25 Oct 2023 02:27:38 +0200 Subject: [PATCH] mod_php_install.sh: add support for version 7.1 at debian 12 (bookworm). --- mod_php_install.sh | 82 +++++++++++++++++++++++++++------------------- 1 file changed, 49 insertions(+), 33 deletions(-) diff --git a/mod_php_install.sh b/mod_php_install.sh index d1993ac..c689345 100755 --- a/mod_php_install.sh +++ b/mod_php_install.sh @@ -1891,37 +1891,6 @@ if ([[ "$PHP_MAJOR_VERSION" -eq 7 ]] && [[ "$PHP_MINOR_VERSION" -lt 4 ]]) \ if [[ "$PHP_MAJOR_VERSION" -lt 7 ]] \ || ([[ "$PHP_MAJOR_VERSION" -eq 7 ]] && [[ "$PHP_MINOR_VERSION" -eq 0 ]]) ; then - echo "" - echo "" - echo -e "\033[32m--\033[m" - echo "" - echo -e "We need to install a version of libicu (icu4c), which supports" - echo -e "service 'icu-config'. The development library libicu-dev" - echo -e "of this distribution doesn't." - echo -e "" - echo -e "Which version of icu4c should be installed?" - echo "" - ICU4C_VERSION= - if [[ -n "$_ICU4C_VERSION" ]]; then - echononl "ICU4C Version [${_ICU4C_VERSION}]: " - read ICU4C_VERSION - if [[ "X$ICU4C_VERSION" = "X" ]] ; then - ICU4C_VERSION="$_ICU4C_VERSION" - fi - else - echononl "ICU4C Version: " - read ICU4C_VERSION - while [[ "X$ICU4C_VERSION" = "X" ]]; do - echo -e "\n \033[33m\033[1ICU4C Version must not be empty!\033[m\n" - echononl "ICU4C Version : " - read ICU4C_VERSION - done - fi - - ICU4C_MAJOR_VERSION=`echo $ICU4C_VERSION | cut -d '-' -f1` - ICU4C_MINOR_VERSION=`echo $ICU4C_VERSION | cut -d '-' -f2` - - _install_icu4c=true echo "" echo "" @@ -1981,6 +1950,47 @@ if ([[ "$PHP_MAJOR_VERSION" -eq 7 ]] && [[ "$PHP_MINOR_VERSION" -lt 4 ]]) \ _install_python2=true + fi + + fi + + if [[ "$PHP_MAJOR_VERSION" -lt 7 ]] \ + || ([[ "$PHP_MAJOR_VERSION" -eq 7 ]] && [[ "$PHP_MINOR_VERSION" -lt 2 ]]) ; then + + echo "" + echo "" + echo -e "\033[32m--\033[m" + echo "" + echo -e "We need to install a version of libicu (icu4c), which supports" + echo -e "service 'icu-config'. The development library libicu-dev" + echo -e "of this distribution doesn't." + echo -e "" + echo -e "Which version of icu4c should be installed?" + echo "" + ICU4C_VERSION= + if [[ -n "$_ICU4C_VERSION" ]]; then + echononl "ICU4C Version [${_ICU4C_VERSION}]: " + read ICU4C_VERSION + if [[ "X$ICU4C_VERSION" = "X" ]] ; then + ICU4C_VERSION="$_ICU4C_VERSION" + fi + else + echononl "ICU4C Version: " + read ICU4C_VERSION + while [[ "X$ICU4C_VERSION" = "X" ]]; do + echo -e "\n \033[33m\033[1ICU4C Version must not be empty!\033[m\n" + echononl "ICU4C Version : " + read ICU4C_VERSION + done + fi + + ICU4C_MAJOR_VERSION=`echo $ICU4C_VERSION | cut -d '-' -f1` + ICU4C_MINOR_VERSION=`echo $ICU4C_VERSION | cut -d '-' -f2` + + _install_icu4c=true + + if [[ "$os_dist" = "debian" ]] && [[ $os_version -gt 11 ]] ; then + echo "" echo "" echo -e "\033[32m--\033[m" @@ -3933,8 +3943,14 @@ fi if ([[ "$PHP_MAJOR_VERSION" -eq "5" ]] || ([[ "$PHP_MAJOR_VERSION" -eq "7" ]] && [[ "$PHP_MINOR_VERSION" -eq 0 ]])) \ && [[ "$os_dist" = "debian" ]] && [[ $os_version -ge 10 ]]; then config_params="$config_params - --with-icu-dir=/usr/local/icu4c - --with-libxml-dir=/usr/local/libxml2" + --with-libxml-dir=/usr/local/libxml2 + --with-icu-dir=/usr/local/icu4c" +fi + +if ([[ "$PHP_MAJOR_VERSION" -eq "7" ]] && [[ "$PHP_MINOR_VERSION" -gt 0 ]] && [[ "$PHP_MINOR_VERSION" -lt 2 ]]) \ + && [[ "$os_dist" = "debian" ]] && [[ $os_version -ge 11 ]]; then + config_params="$config_params + --with-icu-dir=/usr/local/icu4c" fi