diff --git a/plugins/php/versions/common/bcmath.sh b/plugins/php/versions/common/bcmath.sh index 20b18c770..a9bedc04c 100755 --- a/plugins/php/versions/common/bcmath.sh +++ b/plugins/php/versions/common/bcmath.sh @@ -49,7 +49,7 @@ Install_lib() if [ ! -f "$extFile" ];then if [ ! -d $sourcePath/php${version}/ext ];then - cd ${rootPath}/plugins/php && /bin/bash install.sh install ${version} + cd ${rootPath}/plugins/php && /bin/bash ${rootPath}/plugins/php/versions/${version}/install.sh install fi cd $sourcePath/php${version}/ext/${LIBNAME} @@ -64,6 +64,9 @@ Install_lib() make clean && make && make install && make clean + if [ -d $sourcePath/php${version} ];then + cd ${sourcePath} && rm -rf $sourcePath/php${version} + fi fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/common/exif.sh b/plugins/php/versions/common/exif.sh index cce45fc18..85727d1a6 100755 --- a/plugins/php/versions/common/exif.sh +++ b/plugins/php/versions/common/exif.sh @@ -52,7 +52,7 @@ Install_lib() if [ ! -f "$extFile" ];then if [ ! -d $sourcePath/php${version}/ext ];then - cd ${rootPath}/plugins/php && /bin/bash install.sh install ${version} + cd ${rootPath}/plugins/php && /bin/bash ${rootPath}/plugins/php/versions/${version}/install.sh install fi cd $sourcePath/php${version}/ext/${LIBNAME} @@ -72,6 +72,9 @@ Install_lib() make clean && make && make install && make clean + if [ -d $sourcePath/php${version} ];then + cd ${sourcePath} && rm -rf $sourcePath/php${version} + fi fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/common/fileinfo.sh b/plugins/php/versions/common/fileinfo.sh index f548303e8..7ad24dc73 100755 --- a/plugins/php/versions/common/fileinfo.sh +++ b/plugins/php/versions/common/fileinfo.sh @@ -49,8 +49,7 @@ Install_lib() if [ ! -f "$extFile" ];then if [ ! -d $sourcePath/php${version}/ext ];then - echo "cd ${rootPath}/plugins/php && /bin/bash install.sh install ${version}" - cd ${rootPath}/plugins/php && /bin/bash install.sh install ${version} + cd ${rootPath}/plugins/php && /bin/bash ${rootPath}/plugins/php/versions/${version}/install.sh install fi cd $sourcePath/php${version}/ext/${LIBNAME} @@ -84,6 +83,9 @@ Install_lib() make clean && make && make install && make clean + if [ -d $sourcePath/php${version} ];then + cd ${sourcePath} && rm -rf $sourcePath/php${version} + fi fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/common/gettext.sh b/plugins/php/versions/common/gettext.sh index 3a3c66625..2b3e04745 100755 --- a/plugins/php/versions/common/gettext.sh +++ b/plugins/php/versions/common/gettext.sh @@ -44,7 +44,7 @@ Install_lib() if [ ! -f "$extFile" ];then if [ ! -d $sourcePath/php${version}/ext ];then - cd ${rootPath}/plugins/php && /bin/bash install.sh install ${version} + cd ${rootPath}/plugins/php && /bin/bash ${rootPath}/plugins/php/versions/${version}/install.sh install fi cd $sourcePath/php${version}/ext/${LIBNAME} @@ -65,6 +65,9 @@ Install_lib() make clean && make && make install && make clean + if [ -d $sourcePath/php${version} ];then + cd ${sourcePath} && rm -rf $sourcePath/php${version} + fi fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/common/gmp.sh b/plugins/php/versions/common/gmp.sh index 0a8c01a2d..7c3c537c5 100755 --- a/plugins/php/versions/common/gmp.sh +++ b/plugins/php/versions/common/gmp.sh @@ -52,7 +52,7 @@ Install_lib() if [ ! -f "$extFile" ];then if [ ! -d $sourcePath/php${version}/ext ];then - cd ${rootPath}/plugins/php && /bin/bash install.sh install ${version} + cd ${rootPath}/plugins/php && /bin/bash ${rootPath}/plugins/php/versions/${version}/install.sh install fi cd $sourcePath/php${version}/ext/${LIBNAME} @@ -67,6 +67,9 @@ Install_lib() make clean && make && make install && make clean + if [ -d $sourcePath/php${version} ];then + cd ${sourcePath} && rm -rf $sourcePath/php${version} + fi fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/common/iconv.sh b/plugins/php/versions/common/iconv.sh index 937142335..89972bf96 100755 --- a/plugins/php/versions/common/iconv.sh +++ b/plugins/php/versions/common/iconv.sh @@ -50,7 +50,7 @@ Install_lib() if [ ! -f "$extFile" ];then if [ ! -d $sourcePath/php${version}/ext ];then - cd ${rootPath}/plugins/php && /bin/bash install.sh install ${version} + cd ${rootPath}/plugins/php && /bin/bash ${rootPath}/plugins/php/versions/${version}/install.sh install fi cd $sourcePath/php${version}/ext/${LIBNAME} diff --git a/plugins/php/versions/common/intl.sh b/plugins/php/versions/common/intl.sh index d84b3882b..609808a5b 100755 --- a/plugins/php/versions/common/intl.sh +++ b/plugins/php/versions/common/intl.sh @@ -81,7 +81,7 @@ Install_lib() if [ ! -f "$extFile" ];then if [ ! -d $sourcePath/php${version}/ext ];then - cd ${rootPath}/plugins/php && /bin/bash install.sh install ${version} + cd ${rootPath}/plugins/php && /bin/bash ${rootPath}/plugins/php/versions/${version}/install.sh install fi cd $sourcePath/php${version}/ext/${LIBNAME} @@ -93,6 +93,9 @@ Install_lib() ./configure --with-php-config=$serverPath/php/$version/bin/php-config $OPTIONS make clean && make && make install && make clean + if [ -d $sourcePath/php${version} ];then + cd ${sourcePath} && rm -rf $sourcePath/php${version} + fi fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/common/openssl.sh b/plugins/php/versions/common/openssl.sh index e40fb1c50..5fd529ecf 100755 --- a/plugins/php/versions/common/openssl.sh +++ b/plugins/php/versions/common/openssl.sh @@ -54,7 +54,7 @@ Install_lib() if [ ! -f "$extFile" ];then if [ ! -d $sourcePath/php${version}/ext ];then - cd ${rootPath}/plugins/php && /bin/bash install.sh install ${version} + cd ${rootPath}/plugins/php && /bin/bash ${rootPath}/plugins/php/versions/${version}/install.sh install fi cd $sourcePath/php${version}/ext/${LIBNAME} @@ -79,6 +79,10 @@ Install_lib() $OPTIONS \ --with-openssl make clean && make && make install && make clean + + if [ -d $sourcePath/php${version} ];then + cd ${sourcePath} && rm -rf $sourcePath/php${version} + fi fi diff --git a/plugins/php/versions/common/pcntl.sh b/plugins/php/versions/common/pcntl.sh index 536c4866b..b6eec1114 100755 --- a/plugins/php/versions/common/pcntl.sh +++ b/plugins/php/versions/common/pcntl.sh @@ -44,7 +44,7 @@ Install_lib() if [ ! -f "$extFile" ];then if [ ! -d $sourcePath/php${version}/ext ];then - cd ${rootPath}/plugins/php && /bin/bash install.sh install ${version} + cd ${rootPath}/plugins/php && /bin/bash ${rootPath}/plugins/php/versions/${version}/install.sh install fi cd $sourcePath/php${version}/ext/${LIBNAME} @@ -57,6 +57,10 @@ Install_lib() $serverPath/php/$version/bin/phpize ./configure --with-php-config=$serverPath/php/$version/bin/php-config $OPTIONS make clean && make && make install && make clean + + if [ -d $sourcePath/php${version} ];then + cd ${sourcePath} && rm -rf $sourcePath/php${version} + fi fi diff --git a/plugins/php/versions/common/zip.sh b/plugins/php/versions/common/zip.sh index 63bee1116..0798e4de0 100755 --- a/plugins/php/versions/common/zip.sh +++ b/plugins/php/versions/common/zip.sh @@ -59,7 +59,7 @@ Install_lib() if [ ! -f "$extFile" ];then if [ ! -d $sourcePath/php${version}/ext ];then - cd ${rootPath}/plugins/php && /bin/bash install.sh install ${version} + cd ${rootPath}/plugins/php && /bin/bash ${rootPath}/plugins/php/versions/${version}/install.sh install fi cd $sourcePath/php${version}/ext/${LIBNAME} @@ -69,6 +69,10 @@ Install_lib() --with-zip make clean && make && make install && make clean + + if [ -d $sourcePath/php${version} ];then + cd ${sourcePath} && rm -rf $sourcePath/php${version} + fi fi diff --git a/plugins/php/versions/common/zlib.sh b/plugins/php/versions/common/zlib.sh index e1b4e7bdf..5d409d0d9 100755 --- a/plugins/php/versions/common/zlib.sh +++ b/plugins/php/versions/common/zlib.sh @@ -46,7 +46,7 @@ Install_lib() if [ ! -f "$extFile" ];then if [ ! -d $sourcePath/php${version}/ext ];then - cd ${rootPath}/plugins/php && /bin/bash install.sh install ${version} + cd ${rootPath}/plugins/php && /bin/bash ${rootPath}/plugins/php/versions/${version}/install.sh install fi cd $sourcePath/php${version}/ext/${LIBNAME} @@ -63,6 +63,10 @@ Install_lib() $serverPath/php/$version/bin/phpize ./configure --with-php-config=$serverPath/php/$version/bin/php-config $OPTIONS make && make install && make clean + + if [ -d $sourcePath/php${version} ];then + cd ${sourcePath} && rm -rf $sourcePath/php${version} + fi fi