diff --git a/plugins/php/lib/freetype_new.sh b/plugins/php/lib/freetype_new.sh index ab8890ec6..34dadbe91 100644 --- a/plugins/php/lib/freetype_new.sh +++ b/plugins/php/lib/freetype_new.sh @@ -20,6 +20,6 @@ if [ ! -d ${SERVER_ROOT}/freetype ];then cd freetype-2.12.1 ./configure --prefix=${SERVER_ROOT}/freetype_old && make && make install cd $SOURCE_ROOT - rm -rf freetype-2.12.1.tar.gz - rm -rf freetype-2.12.1 + #rm -rf freetype-2.12.1.tar.gz + #rm -rf freetype-2.12.1 fi \ No newline at end of file diff --git a/plugins/php/lib/freetype_old.sh b/plugins/php/lib/freetype_old.sh index 9f7d210c4..234c87a52 100644 --- a/plugins/php/lib/freetype_old.sh +++ b/plugins/php/lib/freetype_old.sh @@ -19,7 +19,7 @@ if [ ! -d ${SERVER_ROOT}/freetype_old ];then tar zxvf freetype-2.7.1.tar.gz cd freetype-2.7.1 ./configure --prefix=${SERVER_ROOT}/freetype_old && make && make install - cd $SOURCE_ROOT - rm -rf freetype-2.7.1.tar.gz - rm -rf freetype-2.7.1 + #cd $SOURCE_ROOT + #rm -rf freetype-2.7.1.tar.gz + #rm -rf freetype-2.7.1 fi \ No newline at end of file diff --git a/plugins/php/lib/libzip.sh b/plugins/php/lib/libzip.sh index 751998975..fb5f4b247 100644 --- a/plugins/php/lib/libzip.sh +++ b/plugins/php/lib/libzip.sh @@ -25,7 +25,7 @@ if [ ! -d ${SERVER_ROOT}/libiconv ];then ./configure --prefix=${SERVER_ROOT}/libzip && make && make install - cd $SOURCE_ROOT - rm -rf libiconv-1.15 - rm -rf libiconv-1.15.tar.gz + #cd $SOURCE_ROOT + #rm -rf libzip-1.3.2 + #rm -rf libzip-1.3.2.tar.gz fi \ No newline at end of file diff --git a/plugins/php/lib/zlib.sh b/plugins/php/lib/zlib.sh new file mode 100644 index 000000000..56e159a18 --- /dev/null +++ b/plugins/php/lib/zlib.sh @@ -0,0 +1,31 @@ +#!/bin/bash +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +export PATH + +curPath=`pwd` +rootPath=$(dirname "$curPath") +rootPath=$(dirname "$rootPath") +rootPath=$(dirname "$rootPath") +rootPath=$(dirname "$rootPath") + +# echo $rootPath + +SERVER_ROOT=$rootPath/lib +SOURCE_ROOT=$rootPath/source/lib + +if [ ! -d ${SERVER_ROOT}/libiconv ];then + + cd $SOURCE_ROOT + if [ ! -f ${SOURCE_ROOT}/zlib-1.2.11.tar.gz ];then + wget -O zlib-1.2.11.tar.gz --no-check-certificate https://github.com/madler/zlib/archive/v1.2.11.tar.gz -T 20 + fi + + tar -zxvf zlib-1.2.11.tar.gz + cd zlib-1.2.11 + + ./configure --prefix=${SERVER_ROOT}/zlib && make && make install + + #cd $SOURCE_ROOT + #rm -rf zlib-1.2.11 + #rm -rf zlib-1.2.11.tar.gz +fi \ No newline at end of file diff --git a/plugins/php/versions/52/install.sh b/plugins/php/versions/52/install.sh index 3cc528f7a..5bacea599 100755 --- a/plugins/php/versions/52/install.sh +++ b/plugins/php/versions/52/install.sh @@ -22,6 +22,7 @@ mkdir -p $serverPath/php cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash freetype_old.sh cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash libiconv.sh +cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash zlib.sh if [ ! -d $sourcePath/php/php${PHP_VER} ];then if [ ! -f $sourcePath/php/php-${version}.tar.gz ];then diff --git a/plugins/php/versions/53/install.sh b/plugins/php/versions/53/install.sh index 084699a9f..dc424ac7f 100755 --- a/plugins/php/versions/53/install.sh +++ b/plugins/php/versions/53/install.sh @@ -22,6 +22,7 @@ mkdir -p $serverPath/php cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash freetype_old.sh cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash libiconv.sh +cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash zlib.sh if [ ! -d $sourcePath/php/php${PHP_VER} ];then if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then diff --git a/plugins/php/versions/54/install.sh b/plugins/php/versions/54/install.sh index 2c32a47e3..d74517d26 100755 --- a/plugins/php/versions/54/install.sh +++ b/plugins/php/versions/54/install.sh @@ -22,6 +22,7 @@ mkdir -p $serverPath/php cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash freetype_old.sh cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash libiconv.sh +cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash zlib.sh if [ ! -d $sourcePath/php/php${PHP_VER} ];then if [ ! -f $sourcePath/php/php-${version}.tar.gz ];then diff --git a/plugins/php/versions/55/install.sh b/plugins/php/versions/55/install.sh index 0c9948eb9..423b34866 100755 --- a/plugins/php/versions/55/install.sh +++ b/plugins/php/versions/55/install.sh @@ -21,6 +21,7 @@ mkdir -p $serverPath/php cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash freetype_old.sh cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash libiconv.sh +cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash zlib.sh if [ ! -d $sourcePath/php/php${PHP_VER} ];then if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then diff --git a/plugins/php/versions/56/install.sh b/plugins/php/versions/56/install.sh index 67f94402b..7c51e81ec 100755 --- a/plugins/php/versions/56/install.sh +++ b/plugins/php/versions/56/install.sh @@ -21,6 +21,7 @@ mkdir -p $serverPath/php cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash freetype_old.sh cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash libiconv.sh +cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash zlib.sh if [ ! -d $sourcePath/php/php${PHP_VER} ];then if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then diff --git a/plugins/php/versions/70/install.sh b/plugins/php/versions/70/install.sh index 7a3cd08f9..d3998bda9 100755 --- a/plugins/php/versions/70/install.sh +++ b/plugins/php/versions/70/install.sh @@ -21,6 +21,7 @@ mkdir -p $serverPath/php cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash freetype_old.sh cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash libiconv.sh +cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash zlib.sh if [ ! -d $sourcePath/php/php${PHP_VER} ];then if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then diff --git a/plugins/php/versions/71/install.sh b/plugins/php/versions/71/install.sh index 760faf8c8..7c40048c9 100755 --- a/plugins/php/versions/71/install.sh +++ b/plugins/php/versions/71/install.sh @@ -21,6 +21,7 @@ mkdir -p $serverPath/php cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash freetype_old.sh cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash libiconv.sh +cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash zlib.sh if [ ! -d $sourcePath/php/php${PHP_VER} ];then if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then diff --git a/plugins/php/versions/72/install.sh b/plugins/php/versions/72/install.sh index 2b08744d2..a736b1e93 100755 --- a/plugins/php/versions/72/install.sh +++ b/plugins/php/versions/72/install.sh @@ -22,6 +22,7 @@ mkdir -p $serverPath/php cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash freetype_old.sh cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash libiconv.sh +cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash zlib.sh if [ ! -d $sourcePath/php/php${PHP_VER} ];then if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then diff --git a/plugins/php/versions/73/install.sh b/plugins/php/versions/73/install.sh index 88d314fad..c2ac42d88 100755 --- a/plugins/php/versions/73/install.sh +++ b/plugins/php/versions/73/install.sh @@ -22,6 +22,8 @@ mkdir -p $serverPath/php cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash freetype_old.sh cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash libiconv.sh +cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash zlib.sh +cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash libzip.sh if [ ! -d $sourcePath/php/php${PHP_VER} ];then diff --git a/plugins/php/versions/74/install.sh b/plugins/php/versions/74/install.sh index 987f15011..b371917f6 100755 --- a/plugins/php/versions/74/install.sh +++ b/plugins/php/versions/74/install.sh @@ -22,6 +22,8 @@ mkdir -p $serverPath/php cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash freetype_new.sh cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash libiconv.sh +cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash zlib.sh +cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash libzip.sh if [ ! -d $sourcePath/php/php${PHP_VER} ];then diff --git a/plugins/php/versions/80/install.sh b/plugins/php/versions/80/install.sh index b523da667..2cf74b9a8 100755 --- a/plugins/php/versions/80/install.sh +++ b/plugins/php/versions/80/install.sh @@ -22,6 +22,8 @@ mkdir -p $serverPath/php cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash freetype_new.sh cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash libiconv.sh +cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash zlib.sh +cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash libzip.sh if [ ! -d $sourcePath/php/php${PHP_VER} ];then diff --git a/plugins/php/versions/81/install.sh b/plugins/php/versions/81/install.sh index 34f9a3a3a..39d211f8c 100755 --- a/plugins/php/versions/81/install.sh +++ b/plugins/php/versions/81/install.sh @@ -20,6 +20,12 @@ echo "安装php-${version} ..." > $install_tmp mkdir -p $sourcePath/php mkdir -p $serverPath/php +cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash freetype_new.sh +cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash libiconv.sh +cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash zlib.sh +cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash libzip.sh + + if [ ! -d $sourcePath/php/php${PHP_VER} ];then if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then