From cafff1d522354c839b45fdb8c514581d9d089028 Mon Sep 17 00:00:00 2001 From: midoks Date: Tue, 20 Sep 2022 14:29:46 +0800 Subject: [PATCH] up --- plugins/mysql/versions/5.6/install.sh | 2 +- plugins/mysql/versions/5.7/install.sh | 4 ++-- plugins/mysql/versions/8.0/install.sh | 4 ++-- plugins/php/versions/52/install.sh | 2 +- plugins/php/versions/53/install.sh | 2 +- plugins/php/versions/54/install.sh | 2 +- plugins/php/versions/55/install.sh | 4 ++-- plugins/php/versions/56/install.sh | 4 ++-- plugins/php/versions/70/install.sh | 4 ++-- plugins/php/versions/71/install.sh | 4 ++-- plugins/php/versions/72/install.sh | 4 ++-- plugins/php/versions/73/install.sh | 4 ++-- plugins/php/versions/74/install.sh | 6 +++--- plugins/php/versions/80/install.sh | 4 ++-- plugins/php/versions/81/install.sh | 4 ++-- plugins/php/versions/82/install.sh | 4 ++-- plugins/php/versions/common/bcmath.sh | 2 +- plugins/php/versions/common/exif.sh | 2 +- plugins/php/versions/common/fileinfo.sh | 2 +- plugins/php/versions/common/gd.sh | 2 +- plugins/php/versions/common/gd_old.sh | 2 +- plugins/php/versions/common/gettext.sh | 2 +- plugins/php/versions/common/iconv.sh | 2 +- plugins/php/versions/common/intl.sh | 2 +- plugins/php/versions/common/mcrypt.sh | 2 +- plugins/php/versions/common/openssl.sh | 2 +- plugins/php/versions/common/pcntl.sh | 2 +- plugins/php/versions/common/zlib.sh | 2 +- 28 files changed, 41 insertions(+), 41 deletions(-) diff --git a/plugins/mysql/versions/5.6/install.sh b/plugins/mysql/versions/5.6/install.sh index b0d67d46f..e54dce916 100755 --- a/plugins/mysql/versions/5.6/install.sh +++ b/plugins/mysql/versions/5.6/install.sh @@ -74,7 +74,7 @@ Install_mysql() OPENSSL_VERSION=`openssl version|awk '{print $2}'|awk -F '.' '{print $1}'` if [ "${OPENSSL_VERSION}" -ge "3" ];then #openssl version to high - cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash openssl.sh + cd ${rootPath}/plugins/php/lib && /bin/bash openssl.sh export PKG_CONFIG_PATH=$serverPath/lib/openssl/lib/pkgconfig OPTIONS="-DWITH_SSL=${serverPath}/lib/openssl" fi diff --git a/plugins/mysql/versions/5.7/install.sh b/plugins/mysql/versions/5.7/install.sh index 955bbea78..072cff7c7 100755 --- a/plugins/mysql/versions/5.7/install.sh +++ b/plugins/mysql/versions/5.7/install.sh @@ -61,7 +61,7 @@ Install_mysql() fi # ----- cpu end ------ - cd $serverPath/mdserver-web/plugins/mysql/lib && /bin/bash rpcgen.sh + cd ${rootPath}/plugins/mysql/lib && /bin/bash rpcgen.sh if [ ! -f ${mysqlDir}/mysql-boost-${VERSION}.tar.gz ];then wget -O ${mysqlDir}/mysql-boost-${VERSION}.tar.gz --tries=3 https://cdn.mysql.com/Downloads/MySQL-5.7/mysql-boost-${VERSION}.tar.gz @@ -89,7 +89,7 @@ Install_mysql() OPENSSL_VERSION=`openssl version|awk '{print $2}'|awk -F '.' '{print $1}'` if [ "${OPENSSL_VERSION}" -ge "3" ];then #openssl version to high - cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash openssl.sh + cd ${rootPath}/plugins/php/lib && /bin/bash openssl.sh export PKG_CONFIG_PATH=$serverPath/lib/openssl/lib/pkgconfig OPTIONS="-DWITH_SSL=${serverPath}/lib/openssl" fi diff --git a/plugins/mysql/versions/8.0/install.sh b/plugins/mysql/versions/8.0/install.sh index e714c5b43..879330c83 100755 --- a/plugins/mysql/versions/8.0/install.sh +++ b/plugins/mysql/versions/8.0/install.sh @@ -95,7 +95,7 @@ Install_mysql() fi # ----- cpu end ------ - cd $serverPath/mdserver-web/plugins/mysql/lib && /bin/bash rpcgen.sh + cd ${rootPath}/plugins/mysql/lib && /bin/bash rpcgen.sh INSTALL_CMD=cmake # check cmake version @@ -132,7 +132,7 @@ Install_mysql() OPENSSL_VERSION=`openssl version|awk '{print $2}'|awk -F '.' '{print $1}'` if [ "${OPENSSL_VERSION}" -ge "3" ];then #openssl version to high - cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash openssl.sh + cd ${rootPath}/plugins/php/lib && /bin/bash openssl.sh export PKG_CONFIG_PATH=$serverPath/lib/openssl/lib/pkgconfig OPTIONS="-DWITH_SSL=${serverPath}/lib/openssl" fi diff --git a/plugins/php/versions/52/install.sh b/plugins/php/versions/52/install.sh index a03d55286..7d2c608a0 100755 --- a/plugins/php/versions/52/install.sh +++ b/plugins/php/versions/52/install.sh @@ -21,7 +21,7 @@ echo "安装php-${version} ..." > $install_tmp mkdir -p $sourcePath/php mkdir -p $serverPath/php -cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash zlib.sh +cd ${rootPath}/plugins/php/lib && /bin/bash zlib.sh if [ ! -d $sourcePath/php/php${PHP_VER} ];then if [ ! -f $sourcePath/php/php-${version}.tar.gz ];then diff --git a/plugins/php/versions/53/install.sh b/plugins/php/versions/53/install.sh index 22817ad17..959104224 100755 --- a/plugins/php/versions/53/install.sh +++ b/plugins/php/versions/53/install.sh @@ -21,7 +21,7 @@ echo "安装php-5.3.29 ..." > $install_tmp mkdir -p $sourcePath/php mkdir -p $serverPath/php -cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash zlib.sh +cd ${rootPath}/plugins/php/lib && /bin/bash zlib.sh if [ ! -d $sourcePath/php/php${PHP_VER} ];then if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then diff --git a/plugins/php/versions/54/install.sh b/plugins/php/versions/54/install.sh index e72891d1e..9d042dd0f 100755 --- a/plugins/php/versions/54/install.sh +++ b/plugins/php/versions/54/install.sh @@ -21,7 +21,7 @@ mkdir -p $sourcePath/php mkdir -p $serverPath/php -cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash zlib.sh +cd ${rootPath}/plugins/php/lib && /bin/bash zlib.sh if [ ! -d $sourcePath/php/php${PHP_VER} ];then if [ ! -f $sourcePath/php/php-${version}.tar.gz ];then diff --git a/plugins/php/versions/55/install.sh b/plugins/php/versions/55/install.sh index d534b8024..a801717b9 100755 --- a/plugins/php/versions/55/install.sh +++ b/plugins/php/versions/55/install.sh @@ -19,8 +19,8 @@ echo "安装php-5.5.38 ..." > $install_tmp mkdir -p $sourcePath/php mkdir -p $serverPath/php -cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash freetype_old.sh -cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash zlib.sh +cd ${rootPath}/plugins/php/lib && /bin/bash freetype_old.sh +cd ${rootPath}/plugins/php/lib && /bin/bash zlib.sh if [ ! -d $sourcePath/php/php${PHP_VER} ];then if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then diff --git a/plugins/php/versions/56/install.sh b/plugins/php/versions/56/install.sh index d6ae6167b..3d185c01b 100755 --- a/plugins/php/versions/56/install.sh +++ b/plugins/php/versions/56/install.sh @@ -19,8 +19,8 @@ echo "安装php-${version} ..." > $install_tmp mkdir -p $sourcePath/php mkdir -p $serverPath/php -cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash freetype_old.sh -cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash zlib.sh +cd ${rootPath}/plugins/php/lib && /bin/bash freetype_old.sh +cd ${rootPath}/plugins/php/lib && /bin/bash zlib.sh if [ ! -d $sourcePath/php/php${PHP_VER} ];then if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then diff --git a/plugins/php/versions/70/install.sh b/plugins/php/versions/70/install.sh index f544c3b1b..df569d2ff 100755 --- a/plugins/php/versions/70/install.sh +++ b/plugins/php/versions/70/install.sh @@ -19,8 +19,8 @@ echo "安装php-${version} ..." > $install_tmp mkdir -p $sourcePath/php mkdir -p $serverPath/php -cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash freetype_old.sh -cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash zlib.sh +cd ${rootPath}/plugins/php/lib && /bin/bash freetype_old.sh +cd ${rootPath}/plugins/php/lib && /bin/bash zlib.sh if [ ! -d $sourcePath/php/php${PHP_VER} ];then if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then diff --git a/plugins/php/versions/71/install.sh b/plugins/php/versions/71/install.sh index 1f75082fa..9c4c0ac4b 100755 --- a/plugins/php/versions/71/install.sh +++ b/plugins/php/versions/71/install.sh @@ -19,8 +19,8 @@ echo "安装php-${version} ..." > $install_tmp mkdir -p $sourcePath/php mkdir -p $serverPath/php -cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash freetype_old.sh -cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash zlib.sh +cd ${rootPath}/plugins/php/lib && /bin/bash freetype_old.sh +cd ${rootPath}/plugins/php/lib && /bin/bash zlib.sh if [ ! -d $sourcePath/php/php${PHP_VER} ];then if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then diff --git a/plugins/php/versions/72/install.sh b/plugins/php/versions/72/install.sh index 1e4377f74..4f814f83b 100755 --- a/plugins/php/versions/72/install.sh +++ b/plugins/php/versions/72/install.sh @@ -20,8 +20,8 @@ echo "安装php-${version} ..." > $install_tmp mkdir -p $sourcePath/php mkdir -p $serverPath/php -cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash freetype_old.sh -cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash zlib.sh +cd ${rootPath}/plugins/php/lib && /bin/bash freetype_old.sh +cd ${rootPath}/plugins/php/lib && /bin/bash zlib.sh if [ ! -d $sourcePath/php/php${PHP_VER} ];then if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then diff --git a/plugins/php/versions/73/install.sh b/plugins/php/versions/73/install.sh index b213717e0..cb05afe83 100755 --- a/plugins/php/versions/73/install.sh +++ b/plugins/php/versions/73/install.sh @@ -24,8 +24,8 @@ echo "安装php-${version} ..." > $install_tmp mkdir -p $sourcePath/php mkdir -p $serverPath/php -cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash freetype_old.sh -cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash zlib.sh +cd ${rootPath}/plugins/php/lib && /bin/bash freetype_old.sh +cd ${rootPath}/plugins/php/lib && /bin/bash zlib.sh if [ ! -d $sourcePath/php/php${PHP_VER} ];then diff --git a/plugins/php/versions/74/install.sh b/plugins/php/versions/74/install.sh index 18a555a41..a09ffe377 100755 --- a/plugins/php/versions/74/install.sh +++ b/plugins/php/versions/74/install.sh @@ -25,9 +25,9 @@ echo "安装php-${version} ..." > $install_tmp mkdir -p $sourcePath/php mkdir -p $serverPath/php -cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash freetype_new.sh -cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash zlib.sh -cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash libzip.sh +cd ${rootPath}/plugins/php/lib && /bin/bash freetype_new.sh +cd ${rootPath}/plugins/php/lib && /bin/bash zlib.sh +cd ${rootPath}/plugins/php/lib && /bin/bash libzip.sh if [ ! -d $sourcePath/php/php${PHP_VER} ];then diff --git a/plugins/php/versions/80/install.sh b/plugins/php/versions/80/install.sh index 815d1d977..941b12c83 100755 --- a/plugins/php/versions/80/install.sh +++ b/plugins/php/versions/80/install.sh @@ -25,8 +25,8 @@ echo "安装php-${version} ..." > $install_tmp mkdir -p $sourcePath/php mkdir -p $serverPath/php -cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash freetype_new.sh -cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash zlib.sh +cd ${rootPath}/plugins/php/lib && /bin/bash freetype_new.sh +cd ${rootPath}/plugins/php/lib && /bin/bash zlib.sh if [ ! -d $sourcePath/php/php${PHP_VER} ];then diff --git a/plugins/php/versions/81/install.sh b/plugins/php/versions/81/install.sh index 1ac043824..50b72ebd7 100755 --- a/plugins/php/versions/81/install.sh +++ b/plugins/php/versions/81/install.sh @@ -25,8 +25,8 @@ echo "安装php-${version} ..." > $install_tmp mkdir -p $sourcePath/php mkdir -p $serverPath/php -cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash freetype_new.sh -cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash zlib.sh +cd ${rootPath}/plugins/php/lib && /bin/bash freetype_new.sh +cd ${rootPath}/plugins/php/lib && /bin/bash zlib.sh if [ ! -d $sourcePath/php/php${PHP_VER} ];then diff --git a/plugins/php/versions/82/install.sh b/plugins/php/versions/82/install.sh index 0e03fff58..b12362d3e 100755 --- a/plugins/php/versions/82/install.sh +++ b/plugins/php/versions/82/install.sh @@ -25,8 +25,8 @@ echo "安装php-${version} ..." > $install_tmp mkdir -p $sourcePath/php mkdir -p $serverPath/php -cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash freetype_new.sh -cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash zlib.sh +cd ${rootPath}/plugins/php/lib && /bin/bash freetype_new.sh +cd ${rootPath}/plugins/php/lib && /bin/bash zlib.sh if [ ! -d $sourcePath/php/php${PHP_VER} ];then diff --git a/plugins/php/versions/common/bcmath.sh b/plugins/php/versions/common/bcmath.sh index e60a17986..f297456d4 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 $serverPath/mdserver-web/plugins/php && /bin/bash install.sh install ${version} + cd ${rootPath}/plugins/php && /bin/bash install.sh install ${version} fi cd $sourcePath/php${version}/ext/${LIBNAME} diff --git a/plugins/php/versions/common/exif.sh b/plugins/php/versions/common/exif.sh index 622363814..6eb4ad67e 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 $serverPath/mdserver-web/plugins/php && /bin/bash install.sh install ${version} + cd ${rootPath}/plugins/php && /bin/bash install.sh install ${version} fi cd $sourcePath/php${version}/ext/${LIBNAME} diff --git a/plugins/php/versions/common/fileinfo.sh b/plugins/php/versions/common/fileinfo.sh index 8419f5c6e..0f07354ac 100755 --- a/plugins/php/versions/common/fileinfo.sh +++ b/plugins/php/versions/common/fileinfo.sh @@ -49,7 +49,7 @@ Install_lib() if [ ! -f "$extFile" ];then if [ ! -d $sourcePath/php${version}/ext ];then - cd $serverPath/mdserver-web/plugins/php && /bin/bash install.sh install ${version} + cd ${rootPath}/plugins/php && /bin/bash install.sh install ${version} fi cd $sourcePath/php${version}/ext/${LIBNAME} diff --git a/plugins/php/versions/common/gd.sh b/plugins/php/versions/common/gd.sh index 0e54103a6..1195fe407 100755 --- a/plugins/php/versions/common/gd.sh +++ b/plugins/php/versions/common/gd.sh @@ -52,7 +52,7 @@ Install_lib() if [ ! -f "$extFile" ];then if [ ! -d $sourcePath/php${version}/ext ];then - cd $serverPath/mdserver-web/plugins/php && /bin/bash install.sh install ${version} + cd ${rootPath}/plugins/php && /bin/bash install.sh install ${version} fi cd $sourcePath/php${version}/ext/${LIBNAME} diff --git a/plugins/php/versions/common/gd_old.sh b/plugins/php/versions/common/gd_old.sh index abb16a1f1..1923ef0a9 100755 --- a/plugins/php/versions/common/gd_old.sh +++ b/plugins/php/versions/common/gd_old.sh @@ -55,7 +55,7 @@ Install_lib() return fi - cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash freetype_old.sh + cd ${rootPath}/plugins/php/lib && /bin/bash freetype_old.sh if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/common/gettext.sh b/plugins/php/versions/common/gettext.sh index 6a1e7bef7..0534abe18 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 $serverPath/mdserver-web/plugins/php && /bin/bash install.sh install ${version} + cd ${rootPath}/plugins/php && /bin/bash install.sh install ${version} fi cd $sourcePath/php${version}/ext/${LIBNAME} diff --git a/plugins/php/versions/common/iconv.sh b/plugins/php/versions/common/iconv.sh index 6b87bc08c..eaf62f66b 100755 --- a/plugins/php/versions/common/iconv.sh +++ b/plugins/php/versions/common/iconv.sh @@ -45,7 +45,7 @@ Install_lib() return fi - cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash libiconv.sh + cd ${rootPath}/plugins/php/lib && /bin/bash libiconv.sh if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/common/intl.sh b/plugins/php/versions/common/intl.sh index 07ce82755..02c2f7bb7 100755 --- a/plugins/php/versions/common/intl.sh +++ b/plugins/php/versions/common/intl.sh @@ -51,7 +51,7 @@ Install_lib() if [ ! -f "$extFile" ];then if [ ! -d $sourcePath/php${version}/ext ];then - cd $serverPath/mdserver-web/plugins/php && /bin/bash install.sh install ${version} + cd ${rootPath}/plugins/php && /bin/bash install.sh install ${version} fi cd $sourcePath/php${version}/ext/${LIBNAME} diff --git a/plugins/php/versions/common/mcrypt.sh b/plugins/php/versions/common/mcrypt.sh index 9efe3564c..e67d116eb 100755 --- a/plugins/php/versions/common/mcrypt.sh +++ b/plugins/php/versions/common/mcrypt.sh @@ -46,7 +46,7 @@ Install_lib() return fi - cd $serverPath/mdserver-web/plugins/php/lib && bash libmcrypt.sh + cd ${rootPath}/plugins/php/lib && bash libmcrypt.sh if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/common/openssl.sh b/plugins/php/versions/common/openssl.sh index 44d10c334..536db4a55 100755 --- a/plugins/php/versions/common/openssl.sh +++ b/plugins/php/versions/common/openssl.sh @@ -43,7 +43,7 @@ Install_lib() # cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash openssl_10.sh if [ "$version" -lt "70" ];then - cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash openssl_10.sh + cd ${rootPath}/plugins/php/lib && /bin/bash openssl_10.sh fi if [ ! -f "$extFile" ];then diff --git a/plugins/php/versions/common/pcntl.sh b/plugins/php/versions/common/pcntl.sh index 2d86dfaf1..f04cd3f62 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 $serverPath/mdserver-web/plugins/php && /bin/bash install.sh install ${version} + cd ${rootPath}/plugins/php && /bin/bash install.sh install ${version} fi cd $sourcePath/php${version}/ext/${LIBNAME} diff --git a/plugins/php/versions/common/zlib.sh b/plugins/php/versions/common/zlib.sh index 2e63e2fa1..5d8c03c27 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 $serverPath/mdserver-web/plugins/php && /bin/bash install.sh install ${version} + cd ${rootPath}/plugins/php && /bin/bash install.sh install ${version} fi cd $sourcePath/php${version}/ext/${LIBNAME}