diff --git a/plugins/php/versions/53/apc.sh b/plugins/php/versions/53/apc.sh index 728e32beb..12fea1fc4 100755 --- a/plugins/php/versions/53/apc.sh +++ b/plugins/php/versions/53/apc.sh @@ -40,10 +40,6 @@ Install_lib() ./configure --with-php-config=$serverPath/php/$version/bin/php-config make && make install && make clean - cd $php_lib - - rm -rf ${_LIBNAME}-${LIBV} - rm -rf ${_LIBNAME}-${LIBV}.tgz fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/53/eaccelerator.sh b/plugins/php/versions/53/eaccelerator.sh index b34732b80..4fa5a0532 100755 --- a/plugins/php/versions/53/eaccelerator.sh +++ b/plugins/php/versions/53/eaccelerator.sh @@ -46,8 +46,6 @@ Install_lib() --enable-eaccelerator=shared --with-eaccelerator-shared-memory make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/53/intl.sh b/plugins/php/versions/53/intl.sh index ddc0f8e7f..593aa02ff 100755 --- a/plugins/php/versions/53/intl.sh +++ b/plugins/php/versions/53/intl.sh @@ -39,9 +39,7 @@ Install_lib() $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 ${LIBNAME}-* + fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/53/memcache.sh b/plugins/php/versions/53/memcache.sh index b1745286c..9943d9388 100755 --- a/plugins/php/versions/53/memcache.sh +++ b/plugins/php/versions/53/memcache.sh @@ -38,8 +38,6 @@ Install_lib() ./configure --with-php-config=$serverPath/php/$version/bin/php-config --enable-memcache --with-zlib-dir make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/53/memcached.sh b/plugins/php/versions/53/memcached.sh index f7e95c711..66b9f504d 100755 --- a/plugins/php/versions/53/memcached.sh +++ b/plugins/php/versions/53/memcached.sh @@ -42,8 +42,6 @@ Install_lib() --with-libmemcached-dir=$serverPath/lib/libmemcached make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/53/mongo.sh b/plugins/php/versions/53/mongo.sh index d7b225b8f..e48eafacd 100755 --- a/plugins/php/versions/53/mongo.sh +++ b/plugins/php/versions/53/mongo.sh @@ -48,8 +48,6 @@ Install_lib() make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/53/redis.sh b/plugins/php/versions/53/redis.sh index fb4ea928f..e22bed5c3 100755 --- a/plugins/php/versions/53/redis.sh +++ b/plugins/php/versions/53/redis.sh @@ -43,8 +43,6 @@ Install_lib() ./configure --with-php-config=$serverPath/php/$version/bin/php-config make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi sleep 1 if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/53/seaslog.sh b/plugins/php/versions/53/seaslog.sh index 3337cb1c2..23c07cc4e 100755 --- a/plugins/php/versions/53/seaslog.sh +++ b/plugins/php/versions/53/seaslog.sh @@ -48,8 +48,6 @@ Install_lib() ./configure --with-php-config=$serverPath/php/$version/bin/php-config make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi sleep 1 if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/53/solr.sh b/plugins/php/versions/53/solr.sh index 037a944b5..61ed500de 100755 --- a/plugins/php/versions/53/solr.sh +++ b/plugins/php/versions/53/solr.sh @@ -48,8 +48,6 @@ Install_lib() ./configure --with-php-config=$serverPath/php/$version/bin/php-config $OPTIONS make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi sleep 1 if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/53/swoole.sh b/plugins/php/versions/53/swoole.sh index 893909d72..93f02cab6 100755 --- a/plugins/php/versions/53/swoole.sh +++ b/plugins/php/versions/53/swoole.sh @@ -45,8 +45,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 - cd .. - rm -rf ${LIBNAME}-* + fi while [[ ! -f "$extFile" ]]; diff --git a/plugins/php/versions/53/xdebug.sh b/plugins/php/versions/53/xdebug.sh index df9815144..90edb3721 100755 --- a/plugins/php/versions/53/xdebug.sh +++ b/plugins/php/versions/53/xdebug.sh @@ -40,8 +40,6 @@ Install_lib() ./configure --with-php-config=$serverPath/php/$version/bin/php-config make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/53/xhprof.sh b/plugins/php/versions/53/xhprof.sh index b2c3a594d..a9accbb53 100755 --- a/plugins/php/versions/53/xhprof.sh +++ b/plugins/php/versions/53/xhprof.sh @@ -38,8 +38,6 @@ Install_lib() ./configure --enable-xhprof --with-php-config=$serverPath/php/$version/bin/php-config make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/53/yaf.sh b/plugins/php/versions/53/yaf.sh index 72deea7c1..4452cdc42 100755 --- a/plugins/php/versions/53/yaf.sh +++ b/plugins/php/versions/53/yaf.sh @@ -47,9 +47,7 @@ Install_lib() $serverPath/php/$version/bin/phpize ./configure --with-php-config=$serverPath/php/$version/bin/php-config make && make install && make clean - cd .. - rm -rf yaf-* - rm -f package.xml + fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/53/yar.sh b/plugins/php/versions/53/yar.sh index c59b0e26c..569f62671 100755 --- a/plugins/php/versions/53/yar.sh +++ b/plugins/php/versions/53/yar.sh @@ -49,9 +49,7 @@ Install_lib() ./configure --with-php-config=$serverPath/php/$version/bin/php-config \ --with-curl=$serverPath/lib/curl make && make install && make clean - cd .. - rm -rf ${LIBNAME}-* - rm -f package.xml + fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/53/zendguardloader.sh b/plugins/php/versions/53/zendguardloader.sh index 9aa5f60ed..50c0384f1 100755 --- a/plugins/php/versions/53/zendguardloader.sh +++ b/plugins/php/versions/53/zendguardloader.sh @@ -43,8 +43,6 @@ Install_lib() cd ZendGuardLoader-php* && cd php-5.3.x cp ZendGuardLoader.so $serverPath/php/$version/lib/php/extensions/no-debug-non-zts-20090626/ - rm -rf $php_lib/ZendGuardLoader* - rm -rf $php_lib/zend-loader-php5.3* fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/54/apc.sh b/plugins/php/versions/54/apc.sh index b19a68a5c..9f21d950c 100755 --- a/plugins/php/versions/54/apc.sh +++ b/plugins/php/versions/54/apc.sh @@ -40,10 +40,6 @@ Install_lib() ./configure --with-php-config=$serverPath/php/$version/bin/php-config make && make install && make clean - cd $php_lib - - rm -rf ${_LIBNAME}-${LIBV} - rm -rf ${_LIBNAME}-${LIBV}.tgz fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/54/imagemagick.sh b/plugins/php/versions/54/imagemagick.sh index fd8ce3d97..116362249 100755 --- a/plugins/php/versions/54/imagemagick.sh +++ b/plugins/php/versions/54/imagemagick.sh @@ -42,8 +42,6 @@ Install_lib() --with-libmemcached-dir=$serverPath/lib/libmemcached make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/54/memcache.sh b/plugins/php/versions/54/memcache.sh index c430fe5cf..2ab91d1b5 100755 --- a/plugins/php/versions/54/memcache.sh +++ b/plugins/php/versions/54/memcache.sh @@ -38,8 +38,6 @@ Install_lib() ./configure --with-php-config=$serverPath/php/$version/bin/php-config --enable-memcache --with-zlib-dir make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/54/memcached.sh b/plugins/php/versions/54/memcached.sh index 15349b0d0..e84a6d9fc 100755 --- a/plugins/php/versions/54/memcached.sh +++ b/plugins/php/versions/54/memcached.sh @@ -42,8 +42,6 @@ Install_lib() --with-libmemcached-dir=$serverPath/lib/libmemcached make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/54/mongo.sh b/plugins/php/versions/54/mongo.sh index 2c79c27f8..708b7f600 100755 --- a/plugins/php/versions/54/mongo.sh +++ b/plugins/php/versions/54/mongo.sh @@ -48,8 +48,6 @@ Install_lib() make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/54/redis.sh b/plugins/php/versions/54/redis.sh index 7b6d3ee8e..15efec487 100755 --- a/plugins/php/versions/54/redis.sh +++ b/plugins/php/versions/54/redis.sh @@ -43,8 +43,6 @@ Install_lib() ./configure --with-php-config=$serverPath/php/$version/bin/php-config make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi sleep 1 if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/54/seaslog.sh b/plugins/php/versions/54/seaslog.sh index 2e3291ca1..3d5715bb1 100755 --- a/plugins/php/versions/54/seaslog.sh +++ b/plugins/php/versions/54/seaslog.sh @@ -48,8 +48,6 @@ Install_lib() ./configure --with-php-config=$serverPath/php/$version/bin/php-config make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi sleep 1 if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/54/solr.sh b/plugins/php/versions/54/solr.sh index 4f34dadbd..f26e257f8 100755 --- a/plugins/php/versions/54/solr.sh +++ b/plugins/php/versions/54/solr.sh @@ -48,8 +48,6 @@ Install_lib() ./configure --with-php-config=$serverPath/php/$version/bin/php-config $OPTIONS make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi sleep 1 if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/54/swoole.sh b/plugins/php/versions/54/swoole.sh index f540d8f45..d5b3117e0 100755 --- a/plugins/php/versions/54/swoole.sh +++ b/plugins/php/versions/54/swoole.sh @@ -45,8 +45,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 - cd .. - rm -rf ${LIBNAME}-* + fi while [[ ! -f "$extFile" ]]; diff --git a/plugins/php/versions/54/xdebug.sh b/plugins/php/versions/54/xdebug.sh index e8ffd9fa1..10c087e8a 100755 --- a/plugins/php/versions/54/xdebug.sh +++ b/plugins/php/versions/54/xdebug.sh @@ -42,8 +42,6 @@ Install_lib() --with-libmemcached-dir=$serverPath/lib/libmemcached make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/54/xhprof.sh b/plugins/php/versions/54/xhprof.sh index e233e06f9..f144651f3 100755 --- a/plugins/php/versions/54/xhprof.sh +++ b/plugins/php/versions/54/xhprof.sh @@ -38,8 +38,6 @@ Install_lib() ./configure --enable-xhprof --with-php-config=$serverPath/php/$version/bin/php-config make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/54/yaf.sh b/plugins/php/versions/54/yaf.sh index 125c01e7a..e3163dfb0 100755 --- a/plugins/php/versions/54/yaf.sh +++ b/plugins/php/versions/54/yaf.sh @@ -20,7 +20,7 @@ version=$2 extFile=$serverPath/php/${version}/lib/php/extensions/no-debug-non-zts-20100525/${LIBNAME}.so if [ "$version" = '70' ] || [ "$version" = '71' ] || [ "$version" = '72' ] || [ "$version" = '73' ];then - LIBV='3.0.7'; + LIBV='3.0.7' fi Install_lib() @@ -47,9 +47,7 @@ Install_lib() $serverPath/php/$version/bin/phpize ./configure --with-php-config=$serverPath/php/$version/bin/php-config make && make install && make clean - cd .. - rm -rf ${LIBNAME}-* - rm -f package.xml + fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/54/yar.sh b/plugins/php/versions/54/yar.sh index 94888a5b6..1afac6293 100755 --- a/plugins/php/versions/54/yar.sh +++ b/plugins/php/versions/54/yar.sh @@ -49,9 +49,7 @@ Install_lib() ./configure --with-php-config=$serverPath/php/$version/bin/php-config \ --with-curl=$serverPath/lib/curl make && make install && make clean - cd .. - rm -rf ${LIBNAME}-* - rm -f package.xml + fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/55/imagemagick.sh b/plugins/php/versions/55/imagemagick.sh index e8e968e6d..b0c88b157 100755 --- a/plugins/php/versions/55/imagemagick.sh +++ b/plugins/php/versions/55/imagemagick.sh @@ -42,8 +42,6 @@ Install_lib() --with-libmemcached-dir=$serverPath/lib/libmemcached make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/55/memcache.sh b/plugins/php/versions/55/memcache.sh index 8c6c29993..d522c7fa7 100755 --- a/plugins/php/versions/55/memcache.sh +++ b/plugins/php/versions/55/memcache.sh @@ -38,8 +38,6 @@ Install_lib() ./configure --with-php-config=$serverPath/php/$version/bin/php-config --enable-memcache --with-zlib-dir make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/55/memcached.sh b/plugins/php/versions/55/memcached.sh index 46abfe444..bc72cc1f3 100755 --- a/plugins/php/versions/55/memcached.sh +++ b/plugins/php/versions/55/memcached.sh @@ -42,8 +42,6 @@ Install_lib() --with-libmemcached-dir=$serverPath/lib/libmemcached make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/55/mongo.sh b/plugins/php/versions/55/mongo.sh index 82162ad96..aec9e0af3 100755 --- a/plugins/php/versions/55/mongo.sh +++ b/plugins/php/versions/55/mongo.sh @@ -48,8 +48,6 @@ Install_lib() make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/55/mongodb.sh b/plugins/php/versions/55/mongodb.sh index 8591e17b0..e15215663 100755 --- a/plugins/php/versions/55/mongodb.sh +++ b/plugins/php/versions/55/mongodb.sh @@ -40,8 +40,6 @@ Install_lib() ./configure --with-php-config=$serverPath/php/$version/bin/php-config make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/55/redis.sh b/plugins/php/versions/55/redis.sh index d47ef7179..d1d28add8 100755 --- a/plugins/php/versions/55/redis.sh +++ b/plugins/php/versions/55/redis.sh @@ -43,8 +43,6 @@ Install_lib() ./configure --with-php-config=$serverPath/php/$version/bin/php-config make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi sleep 1 if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/55/seaslog.sh b/plugins/php/versions/55/seaslog.sh index 074b6f48b..511ab5e1b 100755 --- a/plugins/php/versions/55/seaslog.sh +++ b/plugins/php/versions/55/seaslog.sh @@ -48,8 +48,6 @@ Install_lib() ./configure --with-php-config=$serverPath/php/$version/bin/php-config make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi sleep 1 if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/55/solr.sh b/plugins/php/versions/55/solr.sh index 00ce51488..693bab4a6 100755 --- a/plugins/php/versions/55/solr.sh +++ b/plugins/php/versions/55/solr.sh @@ -49,8 +49,6 @@ Install_lib() make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi sleep 1 if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/55/swoole.sh b/plugins/php/versions/55/swoole.sh index 364c089ba..eb3a322ef 100755 --- a/plugins/php/versions/55/swoole.sh +++ b/plugins/php/versions/55/swoole.sh @@ -45,8 +45,8 @@ 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 - cd .. - rm -rf ${LIBNAME}-* + + fi while [[ ! -f "$extFile" ]]; diff --git a/plugins/php/versions/55/xdebug.sh b/plugins/php/versions/55/xdebug.sh index 60d9a6dbd..64615a2bb 100755 --- a/plugins/php/versions/55/xdebug.sh +++ b/plugins/php/versions/55/xdebug.sh @@ -41,9 +41,8 @@ Install_lib() --enable-memcache --with-zlib-dir=$serverPath/lib/zlib \ --with-libmemcached-dir=$serverPath/lib/libmemcached make && make install && make clean - - cd $php_lib - rm -rf ${LIBNAME}-* + + fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/55/xhprof.sh b/plugins/php/versions/55/xhprof.sh index e2819c075..6ed32dcef 100755 --- a/plugins/php/versions/55/xhprof.sh +++ b/plugins/php/versions/55/xhprof.sh @@ -38,8 +38,6 @@ Install_lib() ./configure --enable-xhprof --with-php-config=$serverPath/php/$version/bin/php-config make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/55/yaf.sh b/plugins/php/versions/55/yaf.sh index 9a17d3262..24f70e24e 100755 --- a/plugins/php/versions/55/yaf.sh +++ b/plugins/php/versions/55/yaf.sh @@ -49,9 +49,6 @@ Install_lib() make && make install && make clean - cd .. - rm -rf yaf-* - rm -f package.xml fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/55/yar.sh b/plugins/php/versions/55/yar.sh index bc3d623e2..bc788108c 100755 --- a/plugins/php/versions/55/yar.sh +++ b/plugins/php/versions/55/yar.sh @@ -49,9 +49,7 @@ Install_lib() ./configure --with-php-config=$serverPath/php/$version/bin/php-config \ --with-curl=$serverPath/lib/curl make && make install && make clean - cd .. - rm -rf ${LIBNAME}-* - rm -f package.xml + fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/56/imagemagick.sh b/plugins/php/versions/56/imagemagick.sh index 5d91057c5..459651c3f 100755 --- a/plugins/php/versions/56/imagemagick.sh +++ b/plugins/php/versions/56/imagemagick.sh @@ -42,8 +42,6 @@ Install_lib() --with-libmemcached-dir=$serverPath/lib/libmemcached make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/56/memcache.sh b/plugins/php/versions/56/memcache.sh index d1f96d363..9ce28cd66 100755 --- a/plugins/php/versions/56/memcache.sh +++ b/plugins/php/versions/56/memcache.sh @@ -38,8 +38,6 @@ Install_lib() ./configure --with-php-config=$serverPath/php/$version/bin/php-config --enable-memcache --with-zlib-dir make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/56/memcached.sh b/plugins/php/versions/56/memcached.sh index afee2ab94..8c39049ee 100755 --- a/plugins/php/versions/56/memcached.sh +++ b/plugins/php/versions/56/memcached.sh @@ -42,9 +42,7 @@ Install_lib() --with-libmemcached-dir=$serverPath/lib/libmemcached make && make install && make clean - - cd $php_lib - rm -rf ${LIBNAME}-* + fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/56/mongo.sh b/plugins/php/versions/56/mongo.sh index 734bbd0d3..1194a5b27 100755 --- a/plugins/php/versions/56/mongo.sh +++ b/plugins/php/versions/56/mongo.sh @@ -48,8 +48,6 @@ Install_lib() make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/56/mongodb.sh b/plugins/php/versions/56/mongodb.sh index 321fef6d3..01684515e 100755 --- a/plugins/php/versions/56/mongodb.sh +++ b/plugins/php/versions/56/mongodb.sh @@ -41,8 +41,6 @@ Install_lib() make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/56/redis.sh b/plugins/php/versions/56/redis.sh index f65702860..5358c2f91 100755 --- a/plugins/php/versions/56/redis.sh +++ b/plugins/php/versions/56/redis.sh @@ -43,8 +43,6 @@ Install_lib() ./configure --with-php-config=$serverPath/php/$version/bin/php-config make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi sleep 1 if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/56/seaslog.sh b/plugins/php/versions/56/seaslog.sh index b63695440..0ac195534 100755 --- a/plugins/php/versions/56/seaslog.sh +++ b/plugins/php/versions/56/seaslog.sh @@ -48,8 +48,6 @@ Install_lib() ./configure --with-php-config=$serverPath/php/$version/bin/php-config make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi sleep 1 if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/56/solr.sh b/plugins/php/versions/56/solr.sh index 890b72bcb..8f920282c 100755 --- a/plugins/php/versions/56/solr.sh +++ b/plugins/php/versions/56/solr.sh @@ -48,8 +48,6 @@ Install_lib() ./configure --with-php-config=$serverPath/php/$version/bin/php-config $OPTIONS make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi sleep 1 if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/56/swoole.sh b/plugins/php/versions/56/swoole.sh index 6749dd9ad..00fec8ff9 100755 --- a/plugins/php/versions/56/swoole.sh +++ b/plugins/php/versions/56/swoole.sh @@ -45,8 +45,8 @@ 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 - cd .. - rm -rf ${LIBNAME}-* + + fi while [[ ! -f "$extFile" ]]; diff --git a/plugins/php/versions/56/xdebug.sh b/plugins/php/versions/56/xdebug.sh index fd330d664..f302b7040 100755 --- a/plugins/php/versions/56/xdebug.sh +++ b/plugins/php/versions/56/xdebug.sh @@ -40,8 +40,6 @@ Install_lib() ./configure --with-php-config=$serverPath/php/$version/bin/php-config make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/56/xhprof.sh b/plugins/php/versions/56/xhprof.sh index 8140a0d61..255f50d58 100755 --- a/plugins/php/versions/56/xhprof.sh +++ b/plugins/php/versions/56/xhprof.sh @@ -39,8 +39,6 @@ Install_lib() --with-php-config=$serverPath/php/$version/bin/php-config make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/56/yaf.sh b/plugins/php/versions/56/yaf.sh index 59806b139..c6f991911 100755 --- a/plugins/php/versions/56/yaf.sh +++ b/plugins/php/versions/56/yaf.sh @@ -38,9 +38,7 @@ Install_lib() $serverPath/php/$version/bin/phpize ./configure --with-php-config=$serverPath/php/$version/bin/php-config make && make install && make clean - cd .. - rm -rf yaf-* - rm -f package.xml + fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/56/yar.sh b/plugins/php/versions/56/yar.sh index dc24983d4..28c64218e 100755 --- a/plugins/php/versions/56/yar.sh +++ b/plugins/php/versions/56/yar.sh @@ -49,9 +49,7 @@ Install_lib() ./configure --with-php-config=$serverPath/php/$version/bin/php-config \ --with-curl=$serverPath/lib/curl make && make install && make clean - cd .. - rm -rf ${LIBNAME}-* - rm -f package.xml + fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/56/zendguardloader.sh b/plugins/php/versions/56/zendguardloader.sh index 29a68aad3..425ad9d0c 100755 --- a/plugins/php/versions/56/zendguardloader.sh +++ b/plugins/php/versions/56/zendguardloader.sh @@ -37,12 +37,10 @@ Install_lib() wget -O $php_lib/zend-loader-php5.6.tar.gz http://downloads.zend.com/guard/7.0.0/zend-loader-php5.6-linux-x86_64_update1.tar.gz fi - cd $php_lib && tar xvf zend-loader-php5.6.tar.gz cd zend-loader-php5.6* cp ZendGuardLoader.so $serverPath/php/$version/lib/php/extensions/no-debug-non-zts-20131226/ - rm -rf $php_lib/zend-loader-php5.6* fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/70/imagemagick.sh b/plugins/php/versions/70/imagemagick.sh index 95bb03e11..20a5a7cba 100755 --- a/plugins/php/versions/70/imagemagick.sh +++ b/plugins/php/versions/70/imagemagick.sh @@ -42,8 +42,6 @@ Install_lib() --with-libmemcached-dir=$serverPath/lib/libmemcached make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/70/memcached.sh b/plugins/php/versions/70/memcached.sh index 8301afcd3..145532811 100755 --- a/plugins/php/versions/70/memcached.sh +++ b/plugins/php/versions/70/memcached.sh @@ -41,8 +41,6 @@ Install_lib() --with-libmemcached-dir=$serverPath/lib/libmemcached make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/70/mongodb.sh b/plugins/php/versions/70/mongodb.sh index e01e01926..859df469c 100755 --- a/plugins/php/versions/70/mongodb.sh +++ b/plugins/php/versions/70/mongodb.sh @@ -40,8 +40,6 @@ Install_lib() ./configure --with-php-config=$serverPath/php/$version/bin/php-config make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/70/redis.sh b/plugins/php/versions/70/redis.sh index 3ba2ec1e0..58bf338f6 100755 --- a/plugins/php/versions/70/redis.sh +++ b/plugins/php/versions/70/redis.sh @@ -43,8 +43,6 @@ Install_lib() ./configure --with-php-config=$serverPath/php/$version/bin/php-config make && make install && make clean - # cd $php_lib - # rm -rf ${LIBNAME}-* fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/70/seaslog.sh b/plugins/php/versions/70/seaslog.sh index 40c8e6f44..4a2eb1cd0 100755 --- a/plugins/php/versions/70/seaslog.sh +++ b/plugins/php/versions/70/seaslog.sh @@ -48,8 +48,6 @@ Install_lib() ./configure --with-php-config=$serverPath/php/$version/bin/php-config make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi sleep 1 if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/70/solr.sh b/plugins/php/versions/70/solr.sh index 1c711882e..283f889c2 100755 --- a/plugins/php/versions/70/solr.sh +++ b/plugins/php/versions/70/solr.sh @@ -48,8 +48,6 @@ Install_lib() ./configure --with-php-config=$serverPath/php/$version/bin/php-config $OPTIONS make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi sleep 1 if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/70/swoole.sh b/plugins/php/versions/70/swoole.sh index 249a3fb84..3438f939c 100755 --- a/plugins/php/versions/70/swoole.sh +++ b/plugins/php/versions/70/swoole.sh @@ -41,8 +41,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 - cd .. - rm -rf ${LIBNAME}-* + fi while [[ ! -f "$extFile" ]]; diff --git a/plugins/php/versions/70/xdebug.sh b/plugins/php/versions/70/xdebug.sh index 2728ad3cb..6a949391b 100755 --- a/plugins/php/versions/70/xdebug.sh +++ b/plugins/php/versions/70/xdebug.sh @@ -40,8 +40,6 @@ Install_lib() ./configure --with-php-config=$serverPath/php/$version/bin/php-config make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/70/yac.sh b/plugins/php/versions/70/yac.sh index ccc7a099c..e7b6c1a54 100755 --- a/plugins/php/versions/70/yac.sh +++ b/plugins/php/versions/70/yac.sh @@ -44,9 +44,7 @@ Install_lib() $serverPath/php/$version/bin/phpize ./configure --with-php-config=$serverPath/php/$version/bin/php-config make && make install && make clean - cd .. - rm -rf yaf-* - rm -f package.xml + fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/70/yaf.sh b/plugins/php/versions/70/yaf.sh index cb6bbcea0..170006410 100755 --- a/plugins/php/versions/70/yaf.sh +++ b/plugins/php/versions/70/yaf.sh @@ -47,9 +47,7 @@ Install_lib() $serverPath/php/$version/bin/phpize ./configure --with-php-config=$serverPath/php/$version/bin/php-config make && make install && make clean - cd .. - rm -rf ${LIBNAME}-* - rm -f package.xml + fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/70/yar.sh b/plugins/php/versions/70/yar.sh index 9b22437b0..639a16d29 100755 --- a/plugins/php/versions/70/yar.sh +++ b/plugins/php/versions/70/yar.sh @@ -49,9 +49,7 @@ Install_lib() ./configure --with-php-config=$serverPath/php/$version/bin/php-config \ --with-curl=$serverPath/lib/curl make && make install && make clean - cd .. - rm -rf ${LIBNAME}-* - rm -f package.xml + fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/71/imagemagick.sh b/plugins/php/versions/71/imagemagick.sh index 47acf8a54..a65eb3731 100755 --- a/plugins/php/versions/71/imagemagick.sh +++ b/plugins/php/versions/71/imagemagick.sh @@ -42,8 +42,6 @@ Install_lib() --with-libmemcached-dir=$serverPath/lib/libmemcached make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/71/memcached.sh b/plugins/php/versions/71/memcached.sh index f97a39000..51e59a78a 100755 --- a/plugins/php/versions/71/memcached.sh +++ b/plugins/php/versions/71/memcached.sh @@ -42,8 +42,6 @@ Install_lib() --disable-memcached-sasl && \ make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/71/mongodb.sh b/plugins/php/versions/71/mongodb.sh index 76bb73dcb..69d5f56f2 100755 --- a/plugins/php/versions/71/mongodb.sh +++ b/plugins/php/versions/71/mongodb.sh @@ -40,8 +40,6 @@ Install_lib() ./configure --with-php-config=$serverPath/php/$version/bin/php-config make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/71/redis.sh b/plugins/php/versions/71/redis.sh index 12aeed79e..8347cca5d 100755 --- a/plugins/php/versions/71/redis.sh +++ b/plugins/php/versions/71/redis.sh @@ -43,8 +43,6 @@ Install_lib() ./configure --with-php-config=$serverPath/php/$version/bin/php-config make && make install && make clean - # cd $php_lib - # rm -rf ${LIBNAME}-* fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/71/seaslog.sh b/plugins/php/versions/71/seaslog.sh index 93b0e7be5..22d684689 100755 --- a/plugins/php/versions/71/seaslog.sh +++ b/plugins/php/versions/71/seaslog.sh @@ -48,8 +48,6 @@ Install_lib() ./configure --with-php-config=$serverPath/php/$version/bin/php-config make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi sleep 1 if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/71/solr.sh b/plugins/php/versions/71/solr.sh index 5b12539b4..32a64754a 100755 --- a/plugins/php/versions/71/solr.sh +++ b/plugins/php/versions/71/solr.sh @@ -47,9 +47,7 @@ Install_lib() $serverPath/php/$version/bin/phpize ./configure --with-php-config=$serverPath/php/$version/bin/php-config $OPTIONS make && make install && make clean - - cd $php_lib - rm -rf ${LIBNAME}-* + fi sleep 1 if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/71/swoole.sh b/plugins/php/versions/71/swoole.sh index 5b9692355..a6b0ce683 100755 --- a/plugins/php/versions/71/swoole.sh +++ b/plugins/php/versions/71/swoole.sh @@ -41,8 +41,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 - cd .. - rm -rf ${LIBNAME}-* + fi while [[ ! -f "$extFile" ]]; diff --git a/plugins/php/versions/71/xdebug.sh b/plugins/php/versions/71/xdebug.sh index 75a125713..2c2486b83 100755 --- a/plugins/php/versions/71/xdebug.sh +++ b/plugins/php/versions/71/xdebug.sh @@ -40,8 +40,6 @@ Install_lib() ./configure --with-php-config=$serverPath/php/$version/bin/php-config make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/71/yac.sh b/plugins/php/versions/71/yac.sh index f137d10f4..ac76a1ee4 100755 --- a/plugins/php/versions/71/yac.sh +++ b/plugins/php/versions/71/yac.sh @@ -44,9 +44,7 @@ Install_lib() $serverPath/php/$version/bin/phpize ./configure --with-php-config=$serverPath/php/$version/bin/php-config make && make install && make clean - cd .. - rm -rf yaf-* - rm -f package.xml + fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/71/yaf.sh b/plugins/php/versions/71/yaf.sh index ba6dc7159..0174aa2a8 100755 --- a/plugins/php/versions/71/yaf.sh +++ b/plugins/php/versions/71/yaf.sh @@ -11,8 +11,6 @@ rootPath=$(dirname "$rootPath") serverPath=$(dirname "$rootPath") sourcePath=${serverPath}/source/php - - actionType=$1 version=$2 @@ -34,8 +32,6 @@ Install_lib() if [ ! -f "$extFile" ];then - - php_lib=$sourcePath/php_lib mkdir -p $php_lib @@ -47,9 +43,7 @@ Install_lib() $serverPath/php/$version/bin/phpize ./configure --with-php-config=$serverPath/php/$version/bin/php-config make && make install && make clean - cd .. - rm -rf ${LIBNAME}-* - rm -f package.xml + fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/71/yar.sh b/plugins/php/versions/71/yar.sh index d5e89cdd3..f4d4f58b0 100755 --- a/plugins/php/versions/71/yar.sh +++ b/plugins/php/versions/71/yar.sh @@ -49,9 +49,7 @@ Install_lib() ./configure --with-php-config=$serverPath/php/$version/bin/php-config \ --with-curl=$serverPath/lib/curl make && make install && make clean - cd .. - rm -rf ${LIBNAME}-* - rm -f package.xml + fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/72/imagemagick.sh b/plugins/php/versions/72/imagemagick.sh index 9ceeafe61..761609b22 100755 --- a/plugins/php/versions/72/imagemagick.sh +++ b/plugins/php/versions/72/imagemagick.sh @@ -43,7 +43,6 @@ Install_lib() make && make install && make clean cd $php_lib - rm -rf ${LIBNAME}-* fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/72/memcached.sh b/plugins/php/versions/72/memcached.sh index 2e570ce7f..d2e5a8cb9 100755 --- a/plugins/php/versions/72/memcached.sh +++ b/plugins/php/versions/72/memcached.sh @@ -43,7 +43,6 @@ Install_lib() make && make install && make clean cd $php_lib - rm -rf ${LIBNAME}-* fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/72/mongodb.sh b/plugins/php/versions/72/mongodb.sh index 2c524541a..9db70d08b 100755 --- a/plugins/php/versions/72/mongodb.sh +++ b/plugins/php/versions/72/mongodb.sh @@ -41,7 +41,6 @@ Install_lib() make && make install && make clean cd $php_lib - rm -rf ${LIBNAME}-* fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/72/redis.sh b/plugins/php/versions/72/redis.sh index 5aa4f89a5..9315833fb 100755 --- a/plugins/php/versions/72/redis.sh +++ b/plugins/php/versions/72/redis.sh @@ -42,9 +42,6 @@ Install_lib() $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 ${LIBNAME}-* fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/72/seaslog.sh b/plugins/php/versions/72/seaslog.sh index fa6c7577d..09cb8bd8f 100755 --- a/plugins/php/versions/72/seaslog.sh +++ b/plugins/php/versions/72/seaslog.sh @@ -48,8 +48,6 @@ Install_lib() ./configure --with-php-config=$serverPath/php/$version/bin/php-config make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi sleep 1 if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/72/solr.sh b/plugins/php/versions/72/solr.sh index 4fd0ddacd..e4ba57a7f 100755 --- a/plugins/php/versions/72/solr.sh +++ b/plugins/php/versions/72/solr.sh @@ -47,9 +47,6 @@ Install_lib() $serverPath/php/$version/bin/phpize ./configure --with-php-config=$serverPath/php/$version/bin/php-config $OPTIONS make && make install && make clean - - cd $php_lib - rm -rf ${LIBNAME}-* fi sleep 1 if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/72/swoole.sh b/plugins/php/versions/72/swoole.sh index 0e95d95a8..5485b69ed 100755 --- a/plugins/php/versions/72/swoole.sh +++ b/plugins/php/versions/72/swoole.sh @@ -41,8 +41,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 - cd .. - rm -rf ${LIBNAME}-* + fi while [[ ! -f "$extFile" ]]; diff --git a/plugins/php/versions/72/xdebug.sh b/plugins/php/versions/72/xdebug.sh index 5acac02c6..5c172dc7d 100755 --- a/plugins/php/versions/72/xdebug.sh +++ b/plugins/php/versions/72/xdebug.sh @@ -40,8 +40,6 @@ Install_lib() ./configure --with-php-config=$serverPath/php/$version/bin/php-config make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/72/yac.sh b/plugins/php/versions/72/yac.sh index 09b717e27..c974fd6d2 100755 --- a/plugins/php/versions/72/yac.sh +++ b/plugins/php/versions/72/yac.sh @@ -45,8 +45,6 @@ Install_lib() ./configure --with-php-config=$serverPath/php/$version/bin/php-config make && make install && make clean cd .. - rm -rf yaf-* - rm -f package.xml fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/72/yaf.sh b/plugins/php/versions/72/yaf.sh index d91cec9a7..7fd64de59 100755 --- a/plugins/php/versions/72/yaf.sh +++ b/plugins/php/versions/72/yaf.sh @@ -47,9 +47,7 @@ Install_lib() $serverPath/php/$version/bin/phpize ./configure --with-php-config=$serverPath/php/$version/bin/php-config make && make install && make clean - cd .. - rm -rf ${LIBNAME}-* - rm -f package.xml + fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/72/yar.sh b/plugins/php/versions/72/yar.sh index c20f8911e..bb8963080 100755 --- a/plugins/php/versions/72/yar.sh +++ b/plugins/php/versions/72/yar.sh @@ -49,9 +49,6 @@ Install_lib() ./configure --with-php-config=$serverPath/php/$version/bin/php-config \ --with-curl=$serverPath/lib/curl make && make install && make clean - cd .. - rm -rf ${LIBNAME}-* - rm -f package.xml fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/73/imagemagick.sh b/plugins/php/versions/73/imagemagick.sh index 2e875662f..728861390 100755 --- a/plugins/php/versions/73/imagemagick.sh +++ b/plugins/php/versions/73/imagemagick.sh @@ -42,8 +42,6 @@ Install_lib() --with-libmemcached-dir=$serverPath/lib/libmemcached make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/73/memcached.sh b/plugins/php/versions/73/memcached.sh index 1446a156e..ba2172bfd 100755 --- a/plugins/php/versions/73/memcached.sh +++ b/plugins/php/versions/73/memcached.sh @@ -42,8 +42,6 @@ Install_lib() --disable-memcached-sasl && \ make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/73/mongodb.sh b/plugins/php/versions/73/mongodb.sh index fddf4d888..77a08120b 100755 --- a/plugins/php/versions/73/mongodb.sh +++ b/plugins/php/versions/73/mongodb.sh @@ -40,8 +40,6 @@ Install_lib() ./configure --with-php-config=$serverPath/php/$version/bin/php-config make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/73/seaslog.sh b/plugins/php/versions/73/seaslog.sh index 910d6d811..afd1a934f 100755 --- a/plugins/php/versions/73/seaslog.sh +++ b/plugins/php/versions/73/seaslog.sh @@ -47,9 +47,7 @@ Install_lib() $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 ${LIBNAME}-* + fi sleep 1 if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/73/solr.sh b/plugins/php/versions/73/solr.sh index f053bdc24..8db5e40d8 100755 --- a/plugins/php/versions/73/solr.sh +++ b/plugins/php/versions/73/solr.sh @@ -48,8 +48,6 @@ Install_lib() ./configure --with-php-config=$serverPath/php/$version/bin/php-config $OPTIONS make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi sleep 1 if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/73/swoole.sh b/plugins/php/versions/73/swoole.sh index 6b0b6dbb7..9981ab597 100755 --- a/plugins/php/versions/73/swoole.sh +++ b/plugins/php/versions/73/swoole.sh @@ -41,8 +41,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 - cd .. - rm -rf ${LIBNAME}-* + fi while [[ ! -f "$extFile" ]]; diff --git a/plugins/php/versions/73/xdebug.sh b/plugins/php/versions/73/xdebug.sh index 80bcdc090..1d1a4064f 100755 --- a/plugins/php/versions/73/xdebug.sh +++ b/plugins/php/versions/73/xdebug.sh @@ -40,8 +40,6 @@ Install_lib() ./configure --with-php-config=$serverPath/php/$version/bin/php-config make && make install && make clean - cd $php_lib - rm -rf ${LIBNAME}-* fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/73/yac.sh b/plugins/php/versions/73/yac.sh index 748eadb8c..0ae8cae61 100755 --- a/plugins/php/versions/73/yac.sh +++ b/plugins/php/versions/73/yac.sh @@ -44,9 +44,6 @@ Install_lib() $serverPath/php/$version/bin/phpize ./configure --with-php-config=$serverPath/php/$version/bin/php-config make && make install && make clean - cd .. - rm -rf yaf-* - rm -f package.xml fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/73/yaf.sh b/plugins/php/versions/73/yaf.sh index cf654d36e..794b8ba8b 100755 --- a/plugins/php/versions/73/yaf.sh +++ b/plugins/php/versions/73/yaf.sh @@ -46,9 +46,7 @@ Install_lib() $serverPath/php/$version/bin/phpize ./configure --with-php-config=$serverPath/php/$version/bin/php-config make && make install && make clean - cd .. - rm -rf ${LIBNAME}-* - rm -f package.xml + fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/73/yar.sh b/plugins/php/versions/73/yar.sh index d198e6c8e..5b01816a5 100755 --- a/plugins/php/versions/73/yar.sh +++ b/plugins/php/versions/73/yar.sh @@ -49,9 +49,7 @@ Install_lib() ./configure --with-php-config=$serverPath/php/$version/bin/php-config \ --with-curl=$serverPath/lib/curl make && make install && make clean - cd .. - rm -rf ${LIBNAME}-* - rm -f package.xml + fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/74/imagemagick.sh b/plugins/php/versions/74/imagemagick.sh index 3c406ada7..624c7a62c 100755 --- a/plugins/php/versions/74/imagemagick.sh +++ b/plugins/php/versions/74/imagemagick.sh @@ -40,10 +40,8 @@ Install_lib() ./configure --with-php-config=$serverPath/php/$version/bin/php-config \ --enable-memcache --with-zlib-dir=$serverPath/lib/zlib \ --with-libmemcached-dir=$serverPath/lib/libmemcached - make && make install - - cd $php_lib - rm -rf ${LIBNAME}-* + make && make install && make clean + fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/74/memcached.sh b/plugins/php/versions/74/memcached.sh index cba9ca2ed..771efc20a 100755 --- a/plugins/php/versions/74/memcached.sh +++ b/plugins/php/versions/74/memcached.sh @@ -42,10 +42,7 @@ Install_lib() --enable-memcache --with-zlib-dir=$serverPath/lib/zlib \ --with-libmemcached-dir=$serverPath/lib/libmemcached \ --disable-memcached-sasl && \ - make && make install - - cd $php_lib - rm -rf ${LIBNAME}-* + make && make install && make clean fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/74/mongodb.sh b/plugins/php/versions/74/mongodb.sh index 394849f98..dd1ae0aca 100755 --- a/plugins/php/versions/74/mongodb.sh +++ b/plugins/php/versions/74/mongodb.sh @@ -38,10 +38,8 @@ Install_lib() cd ${LIBNAME}-${LIBV} $serverPath/php/$version/bin/phpize ./configure --with-php-config=$serverPath/php/$version/bin/php-config - make && make install - - cd $php_lib - rm -rf ${LIBNAME}-* + make && make install && make clean + fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/74/redis.sh b/plugins/php/versions/74/redis.sh index 6f29cdd13..967dd514e 100755 --- a/plugins/php/versions/74/redis.sh +++ b/plugins/php/versions/74/redis.sh @@ -43,8 +43,6 @@ Install_lib() ./configure --with-php-config=$serverPath/php/$version/bin/php-config make && make install && make clean - # cd $php_lib - # rm -rf ${LIBNAME}-* fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/74/swoole.sh b/plugins/php/versions/74/swoole.sh index 86ec48fcf..39e5d92a2 100755 --- a/plugins/php/versions/74/swoole.sh +++ b/plugins/php/versions/74/swoole.sh @@ -40,9 +40,8 @@ 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 - make && make install - cd .. - rm -rf ${LIBNAME}-* + make && make install && make clean + fi while [[ ! -f "$extFile" ]]; diff --git a/plugins/php/versions/74/xdebug.sh b/plugins/php/versions/74/xdebug.sh index b91a14728..21485535a 100755 --- a/plugins/php/versions/74/xdebug.sh +++ b/plugins/php/versions/74/xdebug.sh @@ -38,10 +38,8 @@ Install_lib() cd ${LIBNAME}-${LIBV} $serverPath/php/$version/bin/phpize ./configure --with-php-config=$serverPath/php/$version/bin/php-config - make && make install - - cd $php_lib - rm -rf ${LIBNAME}-* + make && make install && make clean + fi if [ ! -f "$extFile" ];then