From d2160f388dd455c83eb479d55e15212633e034f1 Mon Sep 17 00:00:00 2001 From: midoks Date: Sat, 30 Nov 2019 16:55:45 +0800 Subject: [PATCH] up --- plugins/php/versions/53/apc.sh | 2 +- plugins/php/versions/53/eaccelerator.sh | 16 +++++++++------- plugins/php/versions/53/intl.sh | 2 +- plugins/php/versions/53/memcache.sh | 2 +- plugins/php/versions/53/memcached.sh | 2 +- plugins/php/versions/53/mongo.sh | 21 +++++++++------------ plugins/php/versions/53/opcache.sh | 14 ++++++-------- plugins/php/versions/53/redis.sh | 6 +++--- plugins/php/versions/53/seaslog.sh | 21 +++++++++++---------- plugins/php/versions/53/solr.sh | 20 ++++++++++---------- plugins/php/versions/53/swoole.sh | 18 +++++++++++------- plugins/php/versions/53/xdebug.sh | 12 +++++++----- plugins/php/versions/53/xhprof.sh | 12 +++++++----- plugins/php/versions/53/yaf.sh | 13 ++++++------- plugins/php/versions/53/yar.sh | 13 ++++++------- plugins/php/versions/53/zendguardloader.sh | 2 +- plugins/php/versions/54/apc.sh | 2 +- plugins/php/versions/54/imagemagick.sh | 2 +- plugins/php/versions/54/memcache.sh | 2 +- plugins/php/versions/54/memcached.sh | 2 +- plugins/php/versions/54/mongo.sh | 2 +- plugins/php/versions/54/opcache.sh | 2 +- plugins/php/versions/54/redis.sh | 2 +- plugins/php/versions/54/seaslog.sh | 5 +++-- plugins/php/versions/54/solr.sh | 2 +- plugins/php/versions/54/swoole.sh | 11 ++++++----- plugins/php/versions/54/xdebug.sh | 2 +- plugins/php/versions/55/imagemagick.sh | 2 +- plugins/php/versions/55/memcache.sh | 2 +- plugins/php/versions/55/memcached.sh | 2 +- plugins/php/versions/55/mongo.sh | 2 +- plugins/php/versions/55/mongodb.sh | 2 +- plugins/php/versions/55/opcache.sh | 6 ++++++ plugins/php/versions/55/redis.sh | 2 +- plugins/php/versions/55/seaslog.sh | 5 +++-- plugins/php/versions/55/solr.sh | 2 +- plugins/php/versions/55/swoole.sh | 2 +- plugins/php/versions/55/xdebug.sh | 2 +- plugins/php/versions/55/yaf.sh | 2 +- plugins/php/versions/56/imagemagick.sh | 2 +- plugins/php/versions/56/memcache.sh | 2 +- plugins/php/versions/56/memcached.sh | 2 +- plugins/php/versions/56/mongo.sh | 2 +- plugins/php/versions/56/mongodb.sh | 2 +- plugins/php/versions/56/opcache.sh | 6 ++++++ plugins/php/versions/56/redis.sh | 2 +- plugins/php/versions/56/seaslog.sh | 5 +++-- plugins/php/versions/56/solr.sh | 2 +- plugins/php/versions/56/swoole.sh | 2 +- plugins/php/versions/56/xdebug.sh | 2 +- plugins/php/versions/56/yaf.sh | 4 +++- plugins/php/versions/56/zendguardloader.sh | 2 +- plugins/php/versions/70/imagemagick.sh | 5 ++--- plugins/php/versions/70/memcached.sh | 2 +- plugins/php/versions/70/mongodb.sh | 2 +- plugins/php/versions/70/opcache.sh | 6 ++++++ plugins/php/versions/70/seaslog.sh | 5 +++-- plugins/php/versions/70/solr.sh | 4 ++-- plugins/php/versions/70/swoole.sh | 2 +- plugins/php/versions/70/xdebug.sh | 2 +- plugins/php/versions/70/yac.sh | 2 -- plugins/php/versions/70/yaf.sh | 7 ++----- plugins/php/versions/71/imagemagick.sh | 4 ++-- plugins/php/versions/71/memcached.sh | 5 +++-- plugins/php/versions/71/mongodb.sh | 2 +- plugins/php/versions/71/seaslog.sh | 5 +++-- plugins/php/versions/71/solr.sh | 4 ++-- plugins/php/versions/71/swoole.sh | 2 +- plugins/php/versions/71/xdebug.sh | 4 +--- plugins/php/versions/71/yaf.sh | 2 +- plugins/php/versions/71/yar.sh | 3 +-- plugins/php/versions/72/yaf.sh | 5 +---- plugins/php/versions/73/imagemagick.sh | 2 +- plugins/php/versions/73/memcached.sh | 2 +- plugins/php/versions/73/mongodb.sh | 2 +- plugins/php/versions/73/seaslog.sh | 5 +++-- plugins/php/versions/73/solr.sh | 4 ++-- plugins/php/versions/73/swoole.sh | 3 +-- plugins/php/versions/73/xdebug.sh | 5 ++--- plugins/php/versions/73/yaf.sh | 7 ++----- plugins/php/versions/74/imagemagick.sh | 2 +- plugins/php/versions/74/install.sh | 22 ++++++++++++++-------- plugins/php/versions/74/mongodb.sh | 5 ++--- plugins/php/versions/74/swoole.sh | 4 ++-- plugins/php/versions/74/xdebug.sh | 2 +- 85 files changed, 217 insertions(+), 197 deletions(-) diff --git a/plugins/php/versions/53/apc.sh b/plugins/php/versions/53/apc.sh index 9ec03d7da..366220eaf 100755 --- a/plugins/php/versions/53/apc.sh +++ b/plugins/php/versions/53/apc.sh @@ -22,7 +22,7 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi diff --git a/plugins/php/versions/53/eaccelerator.sh b/plugins/php/versions/53/eaccelerator.sh index 4fa5a0532..b2caa3fd7 100755 --- a/plugins/php/versions/53/eaccelerator.sh +++ b/plugins/php/versions/53/eaccelerator.sh @@ -26,7 +26,7 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi @@ -35,15 +35,17 @@ Install_lib() php_lib=$sourcePath/php_lib mkdir -p $php_lib - # - # wget -O $php_lib/${LIBNAME}-${LIBV}.tgz https://github.com/eaccelerator/eaccelerator/archive/${LIBV}.tar.gz - wget -O $php_lib/${LIBNAME}-${LIBV}.tar.bz2 http://dl.wdlinux.cn:5180/soft/eaccelerator-0.9.6.1.tar.bz2 - cd $php_lib && tar jxvf ${LIBNAME}-${LIBV}.tar.bz2 - cd ${LIBNAME}-${LIBV} + if [ ! -d $php_lib/${LIBNAME}-${LIBV} ];then + wget -O $php_lib/${LIBNAME}-${LIBV}.tgz https://github.com/eaccelerator/eaccelerator/archive/${LIBV}.tar.gz + # wget -O $php_lib/${LIBNAME}-${LIBV}.tar.bz2 http://dl.wdlinux.cn:5180/soft/eaccelerator-0.9.6.1.tar.bz2 + cd $php_lib && tar zxvf ${LIBNAME}-${LIBV}.tar.gz + fi + cd $php_lib/${LIBNAME}-${LIBV} + $serverPath/php/$version/bin/phpize ./configure --with-php-config=$serverPath/php/$version/bin/php-config \ - --enable-eaccelerator=shared --with-eaccelerator-shared-memory + --enable-eaccelerator=shared make && make install && make clean fi diff --git a/plugins/php/versions/53/intl.sh b/plugins/php/versions/53/intl.sh index 593aa02ff..ae11f1c96 100755 --- a/plugins/php/versions/53/intl.sh +++ b/plugins/php/versions/53/intl.sh @@ -22,7 +22,7 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi diff --git a/plugins/php/versions/53/memcache.sh b/plugins/php/versions/53/memcache.sh index 9943d9388..4c9b34748 100755 --- a/plugins/php/versions/53/memcache.sh +++ b/plugins/php/versions/53/memcache.sh @@ -22,7 +22,7 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi diff --git a/plugins/php/versions/53/memcached.sh b/plugins/php/versions/53/memcached.sh index 66b9f504d..85cfa6050 100755 --- a/plugins/php/versions/53/memcached.sh +++ b/plugins/php/versions/53/memcached.sh @@ -22,7 +22,7 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi diff --git a/plugins/php/versions/53/mongo.sh b/plugins/php/versions/53/mongo.sh index 8de38ed85..a5ffaf7e6 100755 --- a/plugins/php/versions/53/mongo.sh +++ b/plugins/php/versions/53/mongo.sh @@ -22,31 +22,28 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi if [ ! -f "$extFile" ];then - php_lib=$sourcePath/php_lib - mkdir -p $php_lib - - if [ ! -f $php_lib/${LIBNAME}-${LIBV}.tgz ];then - wget -O $php_lib/${LIBNAME}-${LIBV}.tgz http://pecl.php.net/get/${LIBNAME}-${LIBV}.tgz - fi - OPTIONS='' if [ $sysName == 'Darwin' ]; then LIB_DEPEND_DIR=`brew info openssl | grep /usr/local/Cellar/openssl | cut -d \ -f 1 | awk 'END {print}'` OPTIONS="--with-openssl-dir=${LIB_DEPEND_DIR}" fi - if [ -f $php_lib/${LIBNAME}-${LIBV} ];then + php_lib=$sourcePath/php_lib + mkdir -p $php_lib + + if [ ! -f $php_lib/${LIBNAME}-${LIBV} ];then + wget -O $php_lib/${LIBNAME}-${LIBV}.tgz http://pecl.php.net/get/${LIBNAME}-${LIBV}.tgz cd $php_lib && tar xvf ${LIBNAME}-${LIBV}.tgz - fi - - cd ${LIBNAME}-${LIBV} + fi + cd $php_lib/${LIBNAME}-${LIBV} + $serverPath/php/$version/bin/phpize ./configure --with-php-config=$serverPath/php/$version/bin/php-config $OPTIONS diff --git a/plugins/php/versions/53/opcache.sh b/plugins/php/versions/53/opcache.sh index b73d6ccbe..907bb0f1a 100755 --- a/plugins/php/versions/53/opcache.sh +++ b/plugins/php/versions/53/opcache.sh @@ -22,7 +22,7 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi @@ -31,17 +31,15 @@ Install_lib() php_lib=$sourcePath/php_${version}_lib mkdir -p $php_lib - wget -O $php_lib/zendopcache-7.0.5.tgz http://pecl.php.net/get/zendopcache-7.0.5.tgz + if [ ! -d $php_lib/zendopcache-7.0.5 ];then + wget -O $php_lib/zendopcache-7.0.5.tgz http://pecl.php.net/get/zendopcache-7.0.5.tgz + cd $php_lib && tar xvf zendopcache-7.0.5.tgz + fi + cd $php_lib/zendopcache-7.0.5 - cd $php_lib && tar xvf zendopcache-7.0.5.tgz - cd zendopcache-7.0.5 $serverPath/php/$version/bin/phpize ./configure --with-php-config=$serverPath/php/$version/bin/php-config make && make install && make clean - - cd $php_lib - rm -rf zendopcache-7.0.5 - rm -rf zendopcache-7.0.5.tgz fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/53/redis.sh b/plugins/php/versions/53/redis.sh index e22bed5c3..41b1cc84b 100755 --- a/plugins/php/versions/53/redis.sh +++ b/plugins/php/versions/53/redis.sh @@ -23,7 +23,7 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi @@ -35,10 +35,10 @@ Install_lib() if [ ! -f $php_lib/${LIBNAME}-${LIBV}.tgz ];then wget -O $php_lib/${LIBNAME}-${LIBV}.tgz http://pecl.php.net/get/${LIBNAME}-${LIBV}.tgz + cd $php_lib && tar xvf ${LIBNAME}-${LIBV}.tgz fi + cd $php_lib/${LIBNAME}-${LIBV} - cd $php_lib && tar xvf ${LIBNAME}-${LIBV}.tgz - cd ${LIBNAME}-${LIBV} $serverPath/php/$version/bin/phpize ./configure --with-php-config=$serverPath/php/$version/bin/php-config make && make install && make clean diff --git a/plugins/php/versions/53/seaslog.sh b/plugins/php/versions/53/seaslog.sh index 23c07cc4e..2fe2aed15 100755 --- a/plugins/php/versions/53/seaslog.sh +++ b/plugins/php/versions/53/seaslog.sh @@ -12,6 +12,7 @@ serverPath=$(dirname "$rootPath") sourcePath=${serverPath}/source/php LIBNAME=SeasLog +_LIBNAME=$(echo $LIBNAME | tr '[A-Z]' '[a-z]') LIBV=2.0.2 sysName=`uname` actionType=$1 @@ -21,29 +22,29 @@ extDir=$serverPath/php/${version}/lib/php/extensions/no-debug-non-zts-20090626/ Install_lib() { - isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` + isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${_LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi extFile=$extDir${LIBNAME}.so if [ ! -f "$extFile" ];then + OPTIONS='' + if [ $sysName == 'Darwin' ]; then + OPTIONS="${OPTIONS} --with-curl=${serverPath}/lib/curl" + fi + php_lib=$sourcePath/php_lib mkdir -p $php_lib if [ ! -f $php_lib/${LIBNAME}-${LIBV}.tgz ];then wget -O $php_lib/${LIBNAME}-${LIBV}.tgz http://pecl.php.net/get/${LIBNAME}-${LIBV}.tgz + cd $php_lib && tar xvf ${LIBNAME}-${LIBV}.tgz fi - - OPTIONS='' - if [ $sysName == 'Darwin' ]; then - OPTIONS="${OPTIONS} --with-curl=${serverPath}/lib/curl" - fi - - cd $php_lib && tar xvf ${LIBNAME}-${LIBV}.tgz - cd ${LIBNAME}-${LIBV} + cd $php_lib/${LIBNAME}-${LIBV} + $serverPath/php/$version/bin/phpize ./configure --with-php-config=$serverPath/php/$version/bin/php-config make && make install && make clean diff --git a/plugins/php/versions/53/solr.sh b/plugins/php/versions/53/solr.sh index 61ed500de..c646ef60e 100755 --- a/plugins/php/versions/53/solr.sh +++ b/plugins/php/versions/53/solr.sh @@ -12,7 +12,7 @@ serverPath=$(dirname "$rootPath") sourcePath=${serverPath}/source/php LIBNAME=solr -LIBV=2.4.0 +LIBV=2.5.0 sysName=`uname` actionType=$1 version=$2 @@ -23,27 +23,27 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi extFile=$extDir${LIBNAME}.so if [ ! -f "$extFile" ];then + OPTIONS='' + if [ $sysName == 'Darwin' ]; then + OPTIONS="${OPTIONS} --with-curl=${serverPath}/lib/curl" + fi + php_lib=$sourcePath/php_lib mkdir -p $php_lib if [ ! -f $php_lib/${LIBNAME}-${LIBV}.tgz ];then wget -O $php_lib/${LIBNAME}-${LIBV}.tgz http://pecl.php.net/get/${LIBNAME}-${LIBV}.tgz + cd $php_lib && tar xvf ${LIBNAME}-${LIBV}.tgz fi - - OPTIONS='' - if [ $sysName == 'Darwin' ]; then - OPTIONS="${OPTIONS} --with-curl=${serverPath}/lib/curl" - fi - - cd $php_lib && tar xvf ${LIBNAME}-${LIBV}.tgz - cd ${LIBNAME}-${LIBV} + cd $php_lib/${LIBNAME}-${LIBV} + $serverPath/php/$version/bin/phpize ./configure --with-php-config=$serverPath/php/$version/bin/php-config $OPTIONS make && make install && make clean diff --git a/plugins/php/versions/53/swoole.sh b/plugins/php/versions/53/swoole.sh index 93f02cab6..c875ed973 100755 --- a/plugins/php/versions/53/swoole.sh +++ b/plugins/php/versions/53/swoole.sh @@ -26,7 +26,7 @@ extFile=$serverPath/php/${version}/lib/php/extensions/no-debug-non-zts-20090626/ Install_lib() { - isInstall=`cat $serverPath/php/$version/etc/php.ini|grep '${LIBNAME}.so'` + isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then echo "php-$version 已安装${LIBNAME},请选择其它版本!" return @@ -36,15 +36,19 @@ Install_lib() php_lib=$sourcePath/php_lib mkdir -p $php_lib - wget -O $php_lib/${LIBNAME}-${LIBV}.tgz http://pecl.php.net/get/${LIBNAME}-${LIBV}.tgz - cd $php_lib - tar xvf ${LIBNAME}-${LIBV}.tgz - cd ${LIBNAME}-${LIBV} + + if [ ! -d $php_lib/${LIBNAME}-${LIBV} ];then + wget -O $php_lib/${LIBNAME}-${LIBV}.tgz http://pecl.php.net/get/${LIBNAME}-${LIBV}.tgz + cd $php_lib && tar xvf ${LIBNAME}-${LIBV}.tgz + fi + cd $php_lib/${LIBNAME}-${LIBV} $serverPath/php/$version/bin/phpize ./configure --with-php-config=$serverPath/php/$version/bin/php-config \ - --enable-openssl --with-openssl-dir=$serverPath/lib/openssl --enable-sockets - make && make install && make clean + --enable-openssl \ + --with-openssl-dir=$serverPath/lib/openssl \ + --enable-sockets + make clean && make && make install && make clean fi diff --git a/plugins/php/versions/53/xdebug.sh b/plugins/php/versions/53/xdebug.sh index 90edb3721..eb1ddd589 100755 --- a/plugins/php/versions/53/xdebug.sh +++ b/plugins/php/versions/53/xdebug.sh @@ -22,7 +22,7 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi @@ -32,10 +32,12 @@ Install_lib() php_lib=$sourcePath/php_lib mkdir -p $php_lib - wget -O $php_lib/${LIBNAME}-${LIBV}.tgz http://pecl.php.net/get/${LIBNAME}-${LIBV}.tgz - - cd $php_lib && tar xvf ${LIBNAME}-${LIBV}.tgz - cd ${LIBNAME}-${LIBV} + if [ ! -d $php_lib/${LIBNAME}-${LIBV} ];then + wget -O $php_lib/${LIBNAME}-${LIBV}.tgz http://pecl.php.net/get/${LIBNAME}-${LIBV}.tgz + cd $php_lib && tar xvf ${LIBNAME}-${LIBV}.tgz + fi + cd $php_lib/${LIBNAME}-${LIBV} + $serverPath/php/$version/bin/phpize ./configure --with-php-config=$serverPath/php/$version/bin/php-config make && make install && make clean diff --git a/plugins/php/versions/53/xhprof.sh b/plugins/php/versions/53/xhprof.sh index a9accbb53..1458a45d9 100755 --- a/plugins/php/versions/53/xhprof.sh +++ b/plugins/php/versions/53/xhprof.sh @@ -29,13 +29,15 @@ Install_lib() if [ ! -f "$extFile" ];then php_lib=$sourcePath/php_lib mkdir -p $php_lib + if [ ! -d $php_lib/${LIBNAME}-${LIBV} ];then + wget -O $php_lib/${LIBNAME}-${LIBV}.tgz http://pecl.php.net/get/${LIBNAME}-${LIBV}.tgz + cd $php_lib && tar xvf ${LIBNAME}-${LIBV}.tgz + fi + cd $php_lib/${LIBNAME}-${LIBV}/extension - wget -O $php_lib/${LIBNAME}-${LIBV}.tgz http://pecl.php.net/get/${LIBNAME}-${LIBV}.tgz - - cd $php_lib && tar xvf ${LIBNAME}-${LIBV}.tgz - cd ${LIBNAME}-${LIBV}/extension $serverPath/php/$version/bin/phpize - ./configure --enable-xhprof --with-php-config=$serverPath/php/$version/bin/php-config + ./configure --enable-xhprof \ + --with-php-config=$serverPath/php/$version/bin/php-config make && make install && make clean fi diff --git a/plugins/php/versions/53/yaf.sh b/plugins/php/versions/53/yaf.sh index 4452cdc42..505f92193 100755 --- a/plugins/php/versions/53/yaf.sh +++ b/plugins/php/versions/53/yaf.sh @@ -33,16 +33,15 @@ Install_lib() fi if [ ! -f "$extFile" ];then - - php_lib=$sourcePath/php_lib - mkdir -p $php_lib - wget -O $php_lib/${LIBNAME}-${LIBV}.tgz http://pecl.php.net/get/${LIBNAME}-${LIBV}.tgz - cd $php_lib - tar xvf ${LIBNAME}-${LIBV}.tgz - cd ${LIBNAME}-${LIBV} + if [ ! -d $php_lib/${LIBNAME}-${LIBV} ];then + wget -O $php_lib/${LIBNAME}-${LIBV}.tgz http://pecl.php.net/get/${LIBNAME}-${LIBV}.tgz + cd $php_lib + tar xvf ${LIBNAME}-${LIBV}.tgz + fi + cd $php_lib/${LIBNAME}-${LIBV} $serverPath/php/$version/bin/phpize ./configure --with-php-config=$serverPath/php/$version/bin/php-config diff --git a/plugins/php/versions/53/yar.sh b/plugins/php/versions/53/yar.sh index 569f62671..cf325ef02 100755 --- a/plugins/php/versions/53/yar.sh +++ b/plugins/php/versions/53/yar.sh @@ -36,16 +36,15 @@ Install_lib() php_lib=$sourcePath/php_lib - mkdir -p $php_lib - wget -O $php_lib/${LIBNAME}-${LIBV}.tgz http://pecl.php.net/get/${LIBNAME}-${LIBV}.tgz - cd $php_lib - tar xvf ${LIBNAME}-${LIBV}.tgz - cd ${LIBNAME}-${LIBV} + + if [ ! -d $php_lib/${LIBNAME}-${LIBV} ];then + wget -O $php_lib/${LIBNAME}-${LIBV}.tgz http://pecl.php.net/get/${LIBNAME}-${LIBV}.tgz + cd $php_lib && tar xvf ${LIBNAME}-${LIBV}.tgz + fi + cd $php_lib/${LIBNAME}-${LIBV} $serverPath/php/$version/bin/phpize - echo "./configure --with-php-config=$serverPath/php/$version/bin/php-config \ - --with-curl=$serverPath/php/curl" ./configure --with-php-config=$serverPath/php/$version/bin/php-config \ --with-curl=$serverPath/lib/curl make && make install && make clean diff --git a/plugins/php/versions/53/zendguardloader.sh b/plugins/php/versions/53/zendguardloader.sh index 50c0384f1..256fed436 100755 --- a/plugins/php/versions/53/zendguardloader.sh +++ b/plugins/php/versions/53/zendguardloader.sh @@ -24,7 +24,7 @@ Install_lib() isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi diff --git a/plugins/php/versions/54/apc.sh b/plugins/php/versions/54/apc.sh index 48b72aa61..3aee0023e 100755 --- a/plugins/php/versions/54/apc.sh +++ b/plugins/php/versions/54/apc.sh @@ -22,7 +22,7 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi diff --git a/plugins/php/versions/54/imagemagick.sh b/plugins/php/versions/54/imagemagick.sh index 116362249..61c53f036 100755 --- a/plugins/php/versions/54/imagemagick.sh +++ b/plugins/php/versions/54/imagemagick.sh @@ -22,7 +22,7 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi diff --git a/plugins/php/versions/54/memcache.sh b/plugins/php/versions/54/memcache.sh index 6a26023d7..20fe6985a 100755 --- a/plugins/php/versions/54/memcache.sh +++ b/plugins/php/versions/54/memcache.sh @@ -22,7 +22,7 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi diff --git a/plugins/php/versions/54/memcached.sh b/plugins/php/versions/54/memcached.sh index 0fa337fd4..c94aa5ae8 100755 --- a/plugins/php/versions/54/memcached.sh +++ b/plugins/php/versions/54/memcached.sh @@ -22,7 +22,7 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi diff --git a/plugins/php/versions/54/mongo.sh b/plugins/php/versions/54/mongo.sh index 015caff1e..172b85dac 100755 --- a/plugins/php/versions/54/mongo.sh +++ b/plugins/php/versions/54/mongo.sh @@ -22,7 +22,7 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi diff --git a/plugins/php/versions/54/opcache.sh b/plugins/php/versions/54/opcache.sh index d8175e781..95c9618a8 100755 --- a/plugins/php/versions/54/opcache.sh +++ b/plugins/php/versions/54/opcache.sh @@ -22,7 +22,7 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi diff --git a/plugins/php/versions/54/redis.sh b/plugins/php/versions/54/redis.sh index 15efec487..ab73e08dd 100755 --- a/plugins/php/versions/54/redis.sh +++ b/plugins/php/versions/54/redis.sh @@ -23,7 +23,7 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi diff --git a/plugins/php/versions/54/seaslog.sh b/plugins/php/versions/54/seaslog.sh index 3d5715bb1..46c696e48 100755 --- a/plugins/php/versions/54/seaslog.sh +++ b/plugins/php/versions/54/seaslog.sh @@ -12,6 +12,7 @@ serverPath=$(dirname "$rootPath") sourcePath=${serverPath}/source/php LIBNAME=SeasLog +_LIBNAME=$(echo $LIBNAME | tr '[A-Z]' '[a-z]') LIBV=2.0.2 sysName=`uname` actionType=$1 @@ -21,9 +22,9 @@ extDir=$serverPath/php/${version}/lib/php/extensions/no-debug-non-zts-20100525/ Install_lib() { - isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` + isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${_LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi diff --git a/plugins/php/versions/54/solr.sh b/plugins/php/versions/54/solr.sh index f26e257f8..20717fde3 100755 --- a/plugins/php/versions/54/solr.sh +++ b/plugins/php/versions/54/solr.sh @@ -23,7 +23,7 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi diff --git a/plugins/php/versions/54/swoole.sh b/plugins/php/versions/54/swoole.sh index 601908b35..b3e399c18 100755 --- a/plugins/php/versions/54/swoole.sh +++ b/plugins/php/versions/54/swoole.sh @@ -14,9 +14,8 @@ sourcePath=${serverPath}/source/php actionType=$1 version=$2 - LIBNAME=swoole -LIBV='1.10.1'; +LIBV='1.10.1' if [ "$version" = '70' ] || [ "$version" = '71' ] || [ "$version" = '72' ];then LIBV='2.2.0' fi @@ -26,7 +25,7 @@ extFile=$serverPath/php/${version}/lib/php/extensions/no-debug-non-zts-20100525/ Install_lib() { - isInstall=`cat $serverPath/php/$version/etc/php.ini|grep '${LIBNAME}.so'` + isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then echo "php-$version 已安装${LIBNAME},请选择其它版本!" return @@ -36,7 +35,7 @@ Install_lib() php_lib=$sourcePath/php_lib mkdir -p $php_lib - if [ -f ${LIBNAME}-${LIBV} ];then + if [ ! -d ${LIBNAME}-${LIBV} ];then wget -O $php_lib/${LIBNAME}-${LIBV}.tgz http://pecl.php.net/get/${LIBNAME}-${LIBV}.tgz cd $php_lib tar xvf ${LIBNAME}-${LIBV}.tgz @@ -45,7 +44,9 @@ Install_lib() $serverPath/php/$version/bin/phpize ./configure --with-php-config=$serverPath/php/$version/bin/php-config \ - --enable-openssl --with-openssl-dir=$serverPath/lib/openssl --enable-sockets + --enable-openssl \ + --with-openssl-dir=$serverPath/lib/openssl \ + --enable-sockets make && make install && make clean fi diff --git a/plugins/php/versions/54/xdebug.sh b/plugins/php/versions/54/xdebug.sh index 10c087e8a..525c5e8e5 100755 --- a/plugins/php/versions/54/xdebug.sh +++ b/plugins/php/versions/54/xdebug.sh @@ -22,7 +22,7 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi diff --git a/plugins/php/versions/55/imagemagick.sh b/plugins/php/versions/55/imagemagick.sh index 18270b15f..2de938f9e 100755 --- a/plugins/php/versions/55/imagemagick.sh +++ b/plugins/php/versions/55/imagemagick.sh @@ -22,7 +22,7 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi diff --git a/plugins/php/versions/55/memcache.sh b/plugins/php/versions/55/memcache.sh index d23d3140f..92737495e 100755 --- a/plugins/php/versions/55/memcache.sh +++ b/plugins/php/versions/55/memcache.sh @@ -22,7 +22,7 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi diff --git a/plugins/php/versions/55/memcached.sh b/plugins/php/versions/55/memcached.sh index 696faa084..e24a998ca 100755 --- a/plugins/php/versions/55/memcached.sh +++ b/plugins/php/versions/55/memcached.sh @@ -22,7 +22,7 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi diff --git a/plugins/php/versions/55/mongo.sh b/plugins/php/versions/55/mongo.sh index 71c8ba3a6..73fd89ac7 100755 --- a/plugins/php/versions/55/mongo.sh +++ b/plugins/php/versions/55/mongo.sh @@ -22,7 +22,7 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi diff --git a/plugins/php/versions/55/mongodb.sh b/plugins/php/versions/55/mongodb.sh index 79093e985..6aac38ab9 100755 --- a/plugins/php/versions/55/mongodb.sh +++ b/plugins/php/versions/55/mongodb.sh @@ -22,7 +22,7 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi diff --git a/plugins/php/versions/55/opcache.sh b/plugins/php/versions/55/opcache.sh index 84d18c31d..de167418a 100755 --- a/plugins/php/versions/55/opcache.sh +++ b/plugins/php/versions/55/opcache.sh @@ -20,6 +20,12 @@ extFile=$serverPath/php/${version}/lib/php/extensions/no-debug-non-zts-20121212/ Install_lib() { + isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` + if [ "${isInstall}" != "" ];then + echo "php-$version 已安装${LIBNAME},请选择其它版本!" + return + fi + echo "" >> $serverPath/php/$version/etc/php.ini echo "[opcache]" >> $serverPath/php/$version/etc/php.ini echo "zend_extension=${LIBNAME}.so" >> $serverPath/php/$version/etc/php.ini diff --git a/plugins/php/versions/55/redis.sh b/plugins/php/versions/55/redis.sh index b4e5ca52e..5c8ff3246 100755 --- a/plugins/php/versions/55/redis.sh +++ b/plugins/php/versions/55/redis.sh @@ -23,7 +23,7 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi diff --git a/plugins/php/versions/55/seaslog.sh b/plugins/php/versions/55/seaslog.sh index 84f9ae378..99f950731 100755 --- a/plugins/php/versions/55/seaslog.sh +++ b/plugins/php/versions/55/seaslog.sh @@ -12,6 +12,7 @@ serverPath=$(dirname "$rootPath") sourcePath=${serverPath}/source/php LIBNAME=SeasLog +_LIBNAME=$(echo $LIBNAME | tr '[A-Z]' '[a-z]') LIBV=2.0.2 sysName=`uname` actionType=$1 @@ -21,9 +22,9 @@ extDir=$serverPath/php/${version}/lib/php/extensions/no-debug-non-zts-20121212/ Install_lib() { - isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` + isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${_LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi diff --git a/plugins/php/versions/55/solr.sh b/plugins/php/versions/55/solr.sh index a126b6e2c..4b77c6f27 100755 --- a/plugins/php/versions/55/solr.sh +++ b/plugins/php/versions/55/solr.sh @@ -23,7 +23,7 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi diff --git a/plugins/php/versions/55/swoole.sh b/plugins/php/versions/55/swoole.sh index 2e5980e18..447d0f5a8 100755 --- a/plugins/php/versions/55/swoole.sh +++ b/plugins/php/versions/55/swoole.sh @@ -22,7 +22,7 @@ extFile=$serverPath/php/${version}/lib/php/extensions/no-debug-non-zts-20121212/ Install_lib() { - isInstall=`cat $serverPath/php/$version/etc/php.ini|grep '${LIBNAME}.so'` + isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then echo "php-$version 已安装${LIBNAME},请选择其它版本!" return diff --git a/plugins/php/versions/55/xdebug.sh b/plugins/php/versions/55/xdebug.sh index f5c5725c3..416e2ae75 100755 --- a/plugins/php/versions/55/xdebug.sh +++ b/plugins/php/versions/55/xdebug.sh @@ -22,7 +22,7 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi diff --git a/plugins/php/versions/55/yaf.sh b/plugins/php/versions/55/yaf.sh index 16a15b81c..a336e5daf 100755 --- a/plugins/php/versions/55/yaf.sh +++ b/plugins/php/versions/55/yaf.sh @@ -13,7 +13,7 @@ sourcePath=${serverPath}/source/php LIBNAME=yaf -LIBV='2.3.5' +LIBV=2.3.5 actionType=$1 version=$2 diff --git a/plugins/php/versions/56/imagemagick.sh b/plugins/php/versions/56/imagemagick.sh index b03db6cf0..07952cd8b 100755 --- a/plugins/php/versions/56/imagemagick.sh +++ b/plugins/php/versions/56/imagemagick.sh @@ -22,7 +22,7 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi diff --git a/plugins/php/versions/56/memcache.sh b/plugins/php/versions/56/memcache.sh index ba2e3f1e7..c493b572f 100755 --- a/plugins/php/versions/56/memcache.sh +++ b/plugins/php/versions/56/memcache.sh @@ -22,7 +22,7 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi diff --git a/plugins/php/versions/56/memcached.sh b/plugins/php/versions/56/memcached.sh index 2a6818cb6..d06fbbe7c 100755 --- a/plugins/php/versions/56/memcached.sh +++ b/plugins/php/versions/56/memcached.sh @@ -22,7 +22,7 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi diff --git a/plugins/php/versions/56/mongo.sh b/plugins/php/versions/56/mongo.sh index 77cd00604..b6bf08709 100755 --- a/plugins/php/versions/56/mongo.sh +++ b/plugins/php/versions/56/mongo.sh @@ -22,7 +22,7 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi diff --git a/plugins/php/versions/56/mongodb.sh b/plugins/php/versions/56/mongodb.sh index d85c32b65..ccac46bdf 100755 --- a/plugins/php/versions/56/mongodb.sh +++ b/plugins/php/versions/56/mongodb.sh @@ -22,7 +22,7 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi diff --git a/plugins/php/versions/56/opcache.sh b/plugins/php/versions/56/opcache.sh index 68f82c29a..f79b68982 100755 --- a/plugins/php/versions/56/opcache.sh +++ b/plugins/php/versions/56/opcache.sh @@ -20,6 +20,12 @@ extFile=$serverPath/php/${version}/lib/php/extensions/no-debug-non-zts-20131226/ Install_lib() { + isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` + if [ "${isInstall}" != "" ];then + echo "php-$version 已安装${LIBNAME},请选择其它版本!" + return + fi + echo "" >> $serverPath/php/$version/etc/php.ini echo "[opcache]" >> $serverPath/php/$version/etc/php.ini echo "zend_extension=${LIBNAME}.so" >> $serverPath/php/$version/etc/php.ini diff --git a/plugins/php/versions/56/redis.sh b/plugins/php/versions/56/redis.sh index 4958ee6c7..1433cfb42 100755 --- a/plugins/php/versions/56/redis.sh +++ b/plugins/php/versions/56/redis.sh @@ -23,7 +23,7 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi diff --git a/plugins/php/versions/56/seaslog.sh b/plugins/php/versions/56/seaslog.sh index 6e82967ca..a6762b730 100755 --- a/plugins/php/versions/56/seaslog.sh +++ b/plugins/php/versions/56/seaslog.sh @@ -12,6 +12,7 @@ serverPath=$(dirname "$rootPath") sourcePath=${serverPath}/source/php LIBNAME=SeasLog +_LIBNAME=$(echo $LIBNAME | tr '[A-Z]' '[a-z]') LIBV=2.0.2 sysName=`uname` actionType=$1 @@ -21,9 +22,9 @@ extDir=$serverPath/php/${version}/lib/php/extensions/no-debug-non-zts-20131226/ Install_lib() { - isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` + isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${_LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi diff --git a/plugins/php/versions/56/solr.sh b/plugins/php/versions/56/solr.sh index 36b60ec91..a12821cbe 100755 --- a/plugins/php/versions/56/solr.sh +++ b/plugins/php/versions/56/solr.sh @@ -23,7 +23,7 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi diff --git a/plugins/php/versions/56/swoole.sh b/plugins/php/versions/56/swoole.sh index ec75ef490..9f5e89fea 100755 --- a/plugins/php/versions/56/swoole.sh +++ b/plugins/php/versions/56/swoole.sh @@ -26,7 +26,7 @@ extFile=$serverPath/php/${version}/lib/php/extensions/no-debug-non-zts-20131226/ Install_lib() { - isInstall=`cat $serverPath/php/$version/etc/php.ini|grep '${LIBNAME}.so'` + isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then echo "php-$version 已安装${LIBNAME},请选择其它版本!" return diff --git a/plugins/php/versions/56/xdebug.sh b/plugins/php/versions/56/xdebug.sh index 98e72799e..87286a8e0 100755 --- a/plugins/php/versions/56/xdebug.sh +++ b/plugins/php/versions/56/xdebug.sh @@ -22,7 +22,7 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi diff --git a/plugins/php/versions/56/yaf.sh b/plugins/php/versions/56/yaf.sh index bd2904944..8532af12d 100755 --- a/plugins/php/versions/56/yaf.sh +++ b/plugins/php/versions/56/yaf.sh @@ -10,13 +10,15 @@ rootPath=$(dirname "$rootPath") rootPath=$(dirname "$rootPath") serverPath=$(dirname "$rootPath") sourcePath=${serverPath}/source/php + +LIBNAME=yaf LIBV=2.3.5 Install_lib() { extFile=$serverPath/php/${version}/lib/php/extensions/no-debug-non-zts-20131226/yaf.so - isInstall=`cat $serverPath/php/$version/etc/php.ini|grep 'yaf.so'` + isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then echo "php-$version 已安装yaf,请选择其它版本!" return diff --git a/plugins/php/versions/56/zendguardloader.sh b/plugins/php/versions/56/zendguardloader.sh index 425ad9d0c..af986d8f6 100755 --- a/plugins/php/versions/56/zendguardloader.sh +++ b/plugins/php/versions/56/zendguardloader.sh @@ -21,7 +21,7 @@ Install_lib() isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi diff --git a/plugins/php/versions/70/imagemagick.sh b/plugins/php/versions/70/imagemagick.sh index 4056c1c43..f80d9bb2e 100755 --- a/plugins/php/versions/70/imagemagick.sh +++ b/plugins/php/versions/70/imagemagick.sh @@ -22,7 +22,7 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi @@ -31,13 +31,12 @@ Install_lib() php_lib=$sourcePath/php_lib mkdir -p $php_lib - if [ ! -d $php_lib/${LIBNAME}-${LIBV}];then wget -O $php_lib/${LIBNAME}-${LIBV}.tgz http://pecl.php.net/get/${LIBNAME}-${LIBV}.tgz cd $php_lib && tar xvf ${LIBNAME}-${LIBV}.tgz fi cd $php_lib/${LIBNAME}-${LIBV} - + $serverPath/php/$version/bin/phpize ./configure --with-php-config=$serverPath/php/$version/bin/php-config \ --enable-memcache --with-zlib-dir=$serverPath/lib/zlib \ diff --git a/plugins/php/versions/70/memcached.sh b/plugins/php/versions/70/memcached.sh index b8c550422..d1eb6cc6d 100755 --- a/plugins/php/versions/70/memcached.sh +++ b/plugins/php/versions/70/memcached.sh @@ -22,7 +22,7 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi diff --git a/plugins/php/versions/70/mongodb.sh b/plugins/php/versions/70/mongodb.sh index 2cda4f2f8..bea61ef4d 100755 --- a/plugins/php/versions/70/mongodb.sh +++ b/plugins/php/versions/70/mongodb.sh @@ -22,7 +22,7 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi diff --git a/plugins/php/versions/70/opcache.sh b/plugins/php/versions/70/opcache.sh index b3199f688..dc266281f 100755 --- a/plugins/php/versions/70/opcache.sh +++ b/plugins/php/versions/70/opcache.sh @@ -20,6 +20,12 @@ extFile=$serverPath/php/${version}/lib/php/extensions/no-debug-non-zts-20151012/ Install_lib() { + isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` + if [ "${isInstall}" != "" ];then + echo "php-$version 已安装${LIBNAME},请选择其它版本!" + return + fi + echo "" >> $serverPath/php/$version/etc/php.ini echo "[opcache]" >> $serverPath/php/$version/etc/php.ini echo "zend_extension=${LIBNAME}.so" >> $serverPath/php/$version/etc/php.ini diff --git a/plugins/php/versions/70/seaslog.sh b/plugins/php/versions/70/seaslog.sh index 1522e3786..21c439ce3 100755 --- a/plugins/php/versions/70/seaslog.sh +++ b/plugins/php/versions/70/seaslog.sh @@ -12,6 +12,7 @@ serverPath=$(dirname "$rootPath") sourcePath=${serverPath}/source/php LIBNAME=SeasLog +_LIBNAME=$(echo $LIBNAME | tr '[A-Z]' '[a-z]') LIBV=2.0.2 sysName=`uname` actionType=$1 @@ -21,9 +22,9 @@ extDir=$serverPath/php/${version}/lib/php/extensions/no-debug-non-zts-20151012/ Install_lib() { - isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` + isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${_LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi diff --git a/plugins/php/versions/70/solr.sh b/plugins/php/versions/70/solr.sh index 395dfabd1..c38216f8e 100755 --- a/plugins/php/versions/70/solr.sh +++ b/plugins/php/versions/70/solr.sh @@ -12,7 +12,7 @@ serverPath=$(dirname "$rootPath") sourcePath=${serverPath}/source/php LIBNAME=solr -LIBV=2.4.0 +LIBV=2.5.0 sysName=`uname` actionType=$1 version=$2 @@ -23,7 +23,7 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi diff --git a/plugins/php/versions/70/swoole.sh b/plugins/php/versions/70/swoole.sh index 9a2facea4..8df474797 100755 --- a/plugins/php/versions/70/swoole.sh +++ b/plugins/php/versions/70/swoole.sh @@ -22,7 +22,7 @@ extFile=$serverPath/php/${version}/lib/php/extensions/no-debug-non-zts-20151012/ Install_lib() { - isInstall=`cat $serverPath/php/$version/etc/php.ini|grep '${LIBNAME}.so'` + isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then echo "php-$version 已安装${LIBNAME},请选择其它版本!" return diff --git a/plugins/php/versions/70/xdebug.sh b/plugins/php/versions/70/xdebug.sh index 40d2ea65c..9d401c54b 100755 --- a/plugins/php/versions/70/xdebug.sh +++ b/plugins/php/versions/70/xdebug.sh @@ -22,7 +22,7 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi diff --git a/plugins/php/versions/70/yac.sh b/plugins/php/versions/70/yac.sh index 80df2a2a8..30b3bb15c 100755 --- a/plugins/php/versions/70/yac.sh +++ b/plugins/php/versions/70/yac.sh @@ -30,8 +30,6 @@ Install_lib() fi if [ ! -f "$extFile" ];then - - php_lib=$sourcePath/php_lib mkdir -p $php_lib diff --git a/plugins/php/versions/70/yaf.sh b/plugins/php/versions/70/yaf.sh index e5fa96a72..1cc47af1c 100755 --- a/plugins/php/versions/70/yaf.sh +++ b/plugins/php/versions/70/yaf.sh @@ -12,15 +12,12 @@ serverPath=$(dirname "$rootPath") sourcePath=${serverPath}/source/php - actionType=$1 version=$2 LIBNAME=yaf -LIBV='2.3.5' -if [ "$version" = '70' ] || [ "$version" = '71' ] || [ "$version" = '72' ] || [ "$version" = '73' ];then - LIBV='3.0.7'; -fi +LIBV=3.0.8 + extFile=$serverPath/php/${version}/lib/php/extensions/no-debug-non-zts-20151012/${LIBNAME}.so Install_lib() diff --git a/plugins/php/versions/71/imagemagick.sh b/plugins/php/versions/71/imagemagick.sh index 0aa8e7a88..be8736de8 100755 --- a/plugins/php/versions/71/imagemagick.sh +++ b/plugins/php/versions/71/imagemagick.sh @@ -22,7 +22,7 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi @@ -30,6 +30,7 @@ Install_lib() php_lib=$sourcePath/php_lib mkdir -p $php_lib + if [ ! -d $php_lib/${LIBNAME}-${LIBV} ];then wget -O $php_lib/${LIBNAME}-${LIBV}.tgz http://pecl.php.net/get/${LIBNAME}-${LIBV}.tgz cd $php_lib && tar xvf ${LIBNAME}-${LIBV}.tgz @@ -42,7 +43,6 @@ Install_lib() --with-zlib-dir=$serverPath/lib/zlib \ --with-libmemcached-dir=$serverPath/lib/libmemcached make && make install && make clean - fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/71/memcached.sh b/plugins/php/versions/71/memcached.sh index 166e8cbf9..52cbe8304 100755 --- a/plugins/php/versions/71/memcached.sh +++ b/plugins/php/versions/71/memcached.sh @@ -22,7 +22,7 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi @@ -39,7 +39,8 @@ Install_lib() $serverPath/php/$version/bin/phpize ./configure --with-php-config=$serverPath/php/$version/bin/php-config \ - --enable-memcache --with-zlib-dir=$serverPath/lib/zlib \ + --enable-memcache \ + --with-zlib-dir=$serverPath/lib/zlib \ --with-libmemcached-dir=$serverPath/lib/libmemcached \ --disable-memcached-sasl && \ make && make install && make clean diff --git a/plugins/php/versions/71/mongodb.sh b/plugins/php/versions/71/mongodb.sh index e2db9836b..50cf70482 100755 --- a/plugins/php/versions/71/mongodb.sh +++ b/plugins/php/versions/71/mongodb.sh @@ -22,7 +22,7 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi diff --git a/plugins/php/versions/71/seaslog.sh b/plugins/php/versions/71/seaslog.sh index 5e657815b..b25e16296 100755 --- a/plugins/php/versions/71/seaslog.sh +++ b/plugins/php/versions/71/seaslog.sh @@ -12,6 +12,7 @@ serverPath=$(dirname "$rootPath") sourcePath=${serverPath}/source/php LIBNAME=SeasLog +_LIBNAME=$(echo $LIBNAME | tr '[A-Z]' '[a-z]') LIBV=2.0.2 sysName=`uname` actionType=$1 @@ -21,9 +22,9 @@ extDir=$serverPath/php/${version}/lib/php/extensions/no-debug-non-zts-20160303/ Install_lib() { - isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` + isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${_LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi diff --git a/plugins/php/versions/71/solr.sh b/plugins/php/versions/71/solr.sh index 0aed22b20..f0a02c489 100755 --- a/plugins/php/versions/71/solr.sh +++ b/plugins/php/versions/71/solr.sh @@ -12,7 +12,7 @@ serverPath=$(dirname "$rootPath") sourcePath=${serverPath}/source/php LIBNAME=solr -LIBV=2.4.0 +LIBV=2.5.0 sysName=`uname` actionType=$1 version=$2 @@ -23,7 +23,7 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi diff --git a/plugins/php/versions/71/swoole.sh b/plugins/php/versions/71/swoole.sh index c6352aa22..f66498871 100755 --- a/plugins/php/versions/71/swoole.sh +++ b/plugins/php/versions/71/swoole.sh @@ -21,7 +21,7 @@ extFile=$serverPath/php/${version}/lib/php/extensions/no-debug-non-zts-20160303/ Install_lib() { - isInstall=`cat $serverPath/php/$version/etc/php.ini|grep '${LIBNAME}.so'` + isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then echo "php-$version 已安装${LIBNAME},请选择其它版本!" return diff --git a/plugins/php/versions/71/xdebug.sh b/plugins/php/versions/71/xdebug.sh index f9f8fe917..22f780ffc 100755 --- a/plugins/php/versions/71/xdebug.sh +++ b/plugins/php/versions/71/xdebug.sh @@ -22,13 +22,11 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi - if [ ! -f "$extFile" ];then - php_lib=$sourcePath/php_lib mkdir -p $php_lib diff --git a/plugins/php/versions/71/yaf.sh b/plugins/php/versions/71/yaf.sh index 95d173175..3b9763d37 100755 --- a/plugins/php/versions/71/yaf.sh +++ b/plugins/php/versions/71/yaf.sh @@ -15,7 +15,7 @@ actionType=$1 version=$2 LIBNAME=yaf -LIBV=3.0.7 +LIBV=3.0.8 extFile=$serverPath/php/${version}/lib/php/extensions/no-debug-non-zts-20160303/${LIBNAME}.so diff --git a/plugins/php/versions/71/yar.sh b/plugins/php/versions/71/yar.sh index 8001095ba..05e54105d 100755 --- a/plugins/php/versions/71/yar.sh +++ b/plugins/php/versions/71/yar.sh @@ -11,7 +11,6 @@ rootPath=$(dirname "$rootPath") serverPath=$(dirname "$rootPath") sourcePath=${serverPath}/source/php - LIBNAME=yar LIBV=1.2.5 @@ -20,7 +19,7 @@ version=$2 extFile=$serverPath/php/${version}/lib/php/extensions/no-debug-non-zts-20160303/${LIBNAME}.so if [ "$version" = '70' ] || [ "$version" = '71' ] || [ "$version" = '72' ] || [ "$version" = '73' ];then - LIBV='2.0.5' + LIBV=2.0.5 fi Install_lib() diff --git a/plugins/php/versions/72/yaf.sh b/plugins/php/versions/72/yaf.sh index e1f805457..54759b21c 100755 --- a/plugins/php/versions/72/yaf.sh +++ b/plugins/php/versions/72/yaf.sh @@ -15,10 +15,7 @@ actionType=$1 version=$2 LIBNAME=yaf -LIBV='2.3.5' -if [ "$version" = '70' ] || [ "$version" = '71' ] || [ "$version" = '72' ] || [ "$version" = '73' ];then - LIBV='3.0.7' -fi +LIBV=3.0.8 extFile=$serverPath/php/${version}/lib/php/extensions/no-debug-non-zts-20170718/${LIBNAME}.so Install_lib() diff --git a/plugins/php/versions/73/imagemagick.sh b/plugins/php/versions/73/imagemagick.sh index d8f1900f4..045fe515f 100755 --- a/plugins/php/versions/73/imagemagick.sh +++ b/plugins/php/versions/73/imagemagick.sh @@ -22,7 +22,7 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi diff --git a/plugins/php/versions/73/memcached.sh b/plugins/php/versions/73/memcached.sh index 947498976..1ef6caa3f 100755 --- a/plugins/php/versions/73/memcached.sh +++ b/plugins/php/versions/73/memcached.sh @@ -22,7 +22,7 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi diff --git a/plugins/php/versions/73/mongodb.sh b/plugins/php/versions/73/mongodb.sh index 3752d7959..f029d7ef1 100755 --- a/plugins/php/versions/73/mongodb.sh +++ b/plugins/php/versions/73/mongodb.sh @@ -22,7 +22,7 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi diff --git a/plugins/php/versions/73/seaslog.sh b/plugins/php/versions/73/seaslog.sh index 4292b63bd..217e62cf7 100755 --- a/plugins/php/versions/73/seaslog.sh +++ b/plugins/php/versions/73/seaslog.sh @@ -12,6 +12,7 @@ serverPath=$(dirname "$rootPath") sourcePath=${serverPath}/source/php LIBNAME=SeasLog +_LIBNAME=$(echo $LIBNAME | tr '[A-Z]' '[a-z]') LIBV=2.0.2 sysName=`uname` actionType=$1 @@ -21,9 +22,9 @@ extDir=$serverPath/php/${version}/lib/php/extensions/no-debug-non-zts-20180731/ Install_lib() { - isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` + isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${_LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi diff --git a/plugins/php/versions/73/solr.sh b/plugins/php/versions/73/solr.sh index 4201516d8..4ac011c27 100755 --- a/plugins/php/versions/73/solr.sh +++ b/plugins/php/versions/73/solr.sh @@ -12,7 +12,7 @@ serverPath=$(dirname "$rootPath") sourcePath=${serverPath}/source/php LIBNAME=solr -LIBV=2.4.0 +LIBV=2.5.0 sysName=`uname` actionType=$1 version=$2 @@ -23,7 +23,7 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi diff --git a/plugins/php/versions/73/swoole.sh b/plugins/php/versions/73/swoole.sh index 71c16dfa8..7d5835192 100755 --- a/plugins/php/versions/73/swoole.sh +++ b/plugins/php/versions/73/swoole.sh @@ -21,8 +21,7 @@ extFile=$serverPath/php/${version}/lib/php/extensions/no-debug-non-zts-20180731/ Install_lib() { - - isInstall=`cat $serverPath/php/$version/etc/php.ini|grep '${LIBNAME}.so'` + isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then echo "php-$version 已安装${LIBNAME},请选择其它版本!" return diff --git a/plugins/php/versions/73/xdebug.sh b/plugins/php/versions/73/xdebug.sh index 3d6a2e4e5..10e65b087 100755 --- a/plugins/php/versions/73/xdebug.sh +++ b/plugins/php/versions/73/xdebug.sh @@ -12,7 +12,7 @@ serverPath=$(dirname "$rootPath") sourcePath=${serverPath}/source/php LIBNAME=xdebug -LIBV=2.7.0 +LIBV=2.8.0 sysName=`uname` actionType=$1 version=$2 @@ -22,7 +22,7 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi @@ -67,7 +67,6 @@ Uninstall_lib() if [ ! -f "$extFile" ];then echo "php-$version 未安装${LIBNAME},请选择其它版本!" - echo "php-$version not install ${LIBNAME}, Plese select other version!" return fi diff --git a/plugins/php/versions/73/yaf.sh b/plugins/php/versions/73/yaf.sh index f2e7c886e..c7bad4178 100755 --- a/plugins/php/versions/73/yaf.sh +++ b/plugins/php/versions/73/yaf.sh @@ -15,9 +15,7 @@ actionType=$1 version=$2 LIBNAME=yaf -LIBV=3.0.7 - - +LIBV=3.0.8 extFile=$serverPath/php/${version}/lib/php/extensions/no-debug-non-zts-20180731/${LIBNAME}.so Install_lib() @@ -35,8 +33,7 @@ Install_lib() mkdir -p $php_lib if [ ! -d $php_lib/${LIBNAME}-${LIBV} ];then wget -O $php_lib/${LIBNAME}-${LIBV}.tgz http://pecl.php.net/get/${LIBNAME}-${LIBV}.tgz - cd $php_lib - tar xvf ${LIBNAME}-${LIBV}.tgz + cd $php_lib && tar xvf ${LIBNAME}-${LIBV}.tgz fi cd $php_lib/${LIBNAME}-${LIBV} diff --git a/plugins/php/versions/74/imagemagick.sh b/plugins/php/versions/74/imagemagick.sh index a20e92d2f..f89bc2091 100755 --- a/plugins/php/versions/74/imagemagick.sh +++ b/plugins/php/versions/74/imagemagick.sh @@ -22,7 +22,7 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi diff --git a/plugins/php/versions/74/install.sh b/plugins/php/versions/74/install.sh index 425f0862e..56fc70d03 100755 --- a/plugins/php/versions/74/install.sh +++ b/plugins/php/versions/74/install.sh @@ -19,20 +19,23 @@ echo "安装php-${version} ..." > $install_tmp mkdir -p $sourcePath/php mkdir -p $serverPath/php -if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then - wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.xz http://au1.php.net/distributions/php-${version}.tar.xz -fi - -if [ ! -d $sourcePath/php/php-${version} ];then - cd $sourcePath/php && tar -Jxf $sourcePath/php/php-${version}.tar.xz +if [ ! -d $sourcePath/php/php-src-php-${version} ];then + wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.gz https://github.com/php/php-src/archive/php-${version}.tar.gz + cd $sourcePath/php && tar zxvf $sourcePath/php/php-${version}.tar.gz fi +cd $sourcePath/php/php-src-php-${version} OPTIONS='' if [ $sysName == 'Darwin' ]; then OPTIONS='--without-iconv' OPTIONS="${OPTIONS} --with-curl=${serverPath}/lib/curl" # OPTIONS="${OPTIONS} --enable-zip" + + export PATH="/usr/local/opt/bison/bin:$PATH" + export LDFLAGS="-L/usr/local/opt/bison/lib" + export PKG_CONFIG_PATH="/usr/local/opt/libxml2/lib/pkgconfig" + export LDFLAGS="-L/usr/local/opt/libxml2/lib" else OPTIONS="--with-iconv=${serverPath}/lib/libiconv" OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype" @@ -42,8 +45,12 @@ else fi +echo "$sourcePath/php/php-src-php-${version}" + if [ ! -d $serverPath/php/74 ];then - cd $sourcePath/php/php-${version} && ./configure \ + cd $sourcePath/php/php-src-php-${version} + ./buildconf --force + ./configure \ --prefix=$serverPath/php/74 \ --exec-prefix=$serverPath/php/74 \ --with-config-file-path=$serverPath/php/74/etc \ @@ -56,7 +63,6 @@ if [ ! -d $serverPath/php/74 ];then --enable-sockets \ --enable-simplexml \ --enable-intl \ - --enable-wddx \ --enable-soap \ --enable-posix \ --enable-sysvmsg \ diff --git a/plugins/php/versions/74/mongodb.sh b/plugins/php/versions/74/mongodb.sh index 21e804154..a651c427f 100755 --- a/plugins/php/versions/74/mongodb.sh +++ b/plugins/php/versions/74/mongodb.sh @@ -22,11 +22,10 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi - - + if [ ! -f "$extFile" ];then php_lib=$sourcePath/php_lib diff --git a/plugins/php/versions/74/swoole.sh b/plugins/php/versions/74/swoole.sh index 392a1ad96..12ea3000d 100755 --- a/plugins/php/versions/74/swoole.sh +++ b/plugins/php/versions/74/swoole.sh @@ -22,7 +22,7 @@ extFile=$serverPath/php/${version}/lib/php/extensions/no-debug-non-zts-20190902/ Install_lib() { - isInstall=`cat $serverPath/php/$version/etc/php.ini|grep '${LIBNAME}.so'` + isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then echo "php-$version 已安装${LIBNAME},请选择其它版本!" return @@ -43,7 +43,7 @@ Install_lib() ./configure --with-php-config=$serverPath/php/$version/bin/php-config \ --enable-openssl --with-openssl-dir=$serverPath/lib/openssl \ --enable-sockets - make && make install && make clean + make clean && make && make install && make clean fi diff --git a/plugins/php/versions/74/xdebug.sh b/plugins/php/versions/74/xdebug.sh index da434ffea..b13ddcea1 100755 --- a/plugins/php/versions/74/xdebug.sh +++ b/plugins/php/versions/74/xdebug.sh @@ -22,7 +22,7 @@ Install_lib() { isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"` if [ "${isInstall}" != "" ];then - echo "php$version 已安装${LIBNAME},请选择其它版本!" + echo "php-$version 已安装${LIBNAME},请选择其它版本!" return fi