From 80f296ea19f97f1e02ec1a8740dc55ba01b5630c Mon Sep 17 00:00:00 2001 From: midoks Date: Sat, 6 May 2023 14:42:54 +0800 Subject: [PATCH] =?UTF-8?q?redat=20=E7=B3=BB=E5=88=97=20php74=E4=B9=8B?= =?UTF-8?q?=E5=90=8E=E9=83=BD=E9=9C=80=E8=A6=81=E5=AE=89=E8=A3=85oniguruma?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit debian系统,不需要 --- plugins/php/versions/74/install.sh | 7 ++++++- plugins/php/versions/80/install.sh | 6 ++++++ plugins/php/versions/81/install.sh | 5 +++++ plugins/php/versions/82/install.sh | 5 +++++ 4 files changed, 22 insertions(+), 1 deletion(-) diff --git a/plugins/php/versions/74/install.sh b/plugins/php/versions/74/install.sh index a611b17aa..560e4348e 100755 --- a/plugins/php/versions/74/install.sh +++ b/plugins/php/versions/74/install.sh @@ -10,7 +10,6 @@ sourcePath=${serverPath}/source sysName=`uname` install_tmp=${rootPath}/tmp/mw_install.pl - function version_gt() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1"; } function version_le() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" == "$1"; } function version_lt() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" != "$1"; } @@ -29,6 +28,12 @@ cd ${rootPath}/plugins/php/lib && /bin/bash freetype_new.sh cd ${rootPath}/plugins/php/lib && /bin/bash zlib.sh cd ${rootPath}/plugins/php/lib && /bin/bash libzip.sh +# redat ge 8 +which yum +if [ "$?" == "0" ];then + cd ${rootPath}/plugins/php/lib && /bin/bash oniguruma.sh +fi + if [ ! -d $sourcePath/php/php${PHP_VER} ];then if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then diff --git a/plugins/php/versions/80/install.sh b/plugins/php/versions/80/install.sh index 697b11972..76bf93047 100755 --- a/plugins/php/versions/80/install.sh +++ b/plugins/php/versions/80/install.sh @@ -28,6 +28,12 @@ mkdir -p $serverPath/php cd ${rootPath}/plugins/php/lib && /bin/bash freetype_new.sh cd ${rootPath}/plugins/php/lib && /bin/bash zlib.sh +# redat ge 8 +which yum +if [ "$?" == "0" ];then + cd ${rootPath}/plugins/php/lib && /bin/bash oniguruma.sh +fi + if [ ! -d $sourcePath/php/php${PHP_VER} ];then if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then diff --git a/plugins/php/versions/81/install.sh b/plugins/php/versions/81/install.sh index f4234f0d0..faceee255 100755 --- a/plugins/php/versions/81/install.sh +++ b/plugins/php/versions/81/install.sh @@ -28,6 +28,11 @@ mkdir -p $serverPath/php cd ${rootPath}/plugins/php/lib && /bin/bash freetype_new.sh cd ${rootPath}/plugins/php/lib && /bin/bash zlib.sh +# redat ge 8 +which yum +if [ "$?" == "0" ];then + cd ${rootPath}/plugins/php/lib && /bin/bash oniguruma.sh +fi if [ ! -d $sourcePath/php/php${PHP_VER} ];then diff --git a/plugins/php/versions/82/install.sh b/plugins/php/versions/82/install.sh index d8ec67689..d8bf1f577 100755 --- a/plugins/php/versions/82/install.sh +++ b/plugins/php/versions/82/install.sh @@ -28,6 +28,11 @@ mkdir -p $serverPath/php cd ${rootPath}/plugins/php/lib && /bin/bash freetype_new.sh cd ${rootPath}/plugins/php/lib && /bin/bash zlib.sh +# redat ge 8 +which yum +if [ "$?" == "0" ];then + cd ${rootPath}/plugins/php/lib && /bin/bash oniguruma.sh +fi if [ ! -d $sourcePath/php/php${PHP_VER} ];then