From 33bc6e19e78b2dc4334c3bd58a9ffbb8c29d54e7 Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Tue, 20 Sep 2022 17:10:09 +0800
Subject: [PATCH] up

---
 plugins/openresty/install.sh           | 1 -
 plugins/php/lib/libmemcached.sh        | 2 --
 plugins/php/versions/52/gd.sh          | 2 +-
 plugins/php/versions/52/install.sh     | 1 -
 plugins/php/versions/52/intl.sh        | 2 +-
 plugins/php/versions/53/intl.sh        | 2 +-
 plugins/php/versions/71/mcrypt.sh      | 2 +-
 plugins/php/versions/common/gd_old.sh  | 4 ++--
 plugins/php/versions/common/iconv.sh   | 2 +-
 plugins/php/versions/common/intl.sh    | 2 +-
 plugins/php/versions/common/openssl.sh | 4 ++--
 plugins/php/versions/common/zip.sh     | 2 +-
 12 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/plugins/openresty/install.sh b/plugins/openresty/install.sh
index 2bb170936..802c156ab 100755
--- a/plugins/openresty/install.sh
+++ b/plugins/openresty/install.sh
@@ -24,7 +24,6 @@ else
 	useradd -g www -s /bin/bash www
 fi
 
-# cd /www/server/mdserver-web/plugins/openresty && /bin/bash install.sh install 1.21.4.1
 Install_openresty()
 {
 	# ----- cpu start ------
diff --git a/plugins/php/lib/libmemcached.sh b/plugins/php/lib/libmemcached.sh
index 2dca0bf21..a26b9fff0 100644
--- a/plugins/php/lib/libmemcached.sh
+++ b/plugins/php/lib/libmemcached.sh
@@ -10,8 +10,6 @@ rootPath=$(dirname "$rootPath")
 
 # echo $rootPath
 
-# cd /www/server/mdserver-web/plugins/php/lib && /bin/bash libmemcached.sh
-
 SERVER_ROOT=$rootPath/lib
 SOURCE_ROOT=$rootPath/source/lib
 
diff --git a/plugins/php/versions/52/gd.sh b/plugins/php/versions/52/gd.sh
index aab4f988b..ab4e397ab 100755
--- a/plugins/php/versions/52/gd.sh
+++ b/plugins/php/versions/52/gd.sh
@@ -74,7 +74,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/52/install.sh b/plugins/php/versions/52/install.sh
index 7d2c608a0..2b242cf2c 100755
--- a/plugins/php/versions/52/install.sh
+++ b/plugins/php/versions/52/install.sh
@@ -131,7 +131,6 @@ fi
 # ps -ef|grep php/52 |grep -v grep |awk '{print $2}'|xargs kill
 # /www/server/php/init.d/php52 start
 # /www/server/php/52/sbin/php-fpm start
-# cd /www/server/mdserver-web && python3 /www/server/mdserver-web/plugins/php/index.py start 52
 mkdir -p $serverPath/php/${PHP_VER}/var/log
 mkdir -p $serverPath/php/${PHP_VER}/var/run
 
diff --git a/plugins/php/versions/52/intl.sh b/plugins/php/versions/52/intl.sh
index 156677458..bd846aff8 100755
--- a/plugins/php/versions/52/intl.sh
+++ b/plugins/php/versions/52/intl.sh
@@ -35,7 +35,7 @@ Install_lib()
 		return
 	fi
 	
-	cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash icu.sh
+	cd $rootPath/plugins/php/lib && /bin/bash icu.sh
 
 	if [ ! -f "$extFile" ];then
 
diff --git a/plugins/php/versions/53/intl.sh b/plugins/php/versions/53/intl.sh
index 2279d47cc..8312fb2a9 100755
--- a/plugins/php/versions/53/intl.sh
+++ b/plugins/php/versions/53/intl.sh
@@ -40,7 +40,7 @@ Install_lib()
 		php_lib=$sourcePath/php_lib
 		mkdir -p $php_lib
 
-		cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash icu.sh
+		cd ${rootPath}/plugins/php/lib && /bin/bash icu.sh
 
 		wget -O $php_lib/${LIBNAME}-${LIBV}.tgz http://pecl.php.net/get/${LIBNAME}-${LIBV}.tgz
 
diff --git a/plugins/php/versions/71/mcrypt.sh b/plugins/php/versions/71/mcrypt.sh
index dd2482c27..c29827b76 100755
--- a/plugins/php/versions/71/mcrypt.sh
+++ b/plugins/php/versions/71/mcrypt.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/gd_old.sh b/plugins/php/versions/common/gd_old.sh
index 1923ef0a9..40412328b 100755
--- a/plugins/php/versions/common/gd_old.sh
+++ b/plugins/php/versions/common/gd_old.sh
@@ -40,7 +40,7 @@ else
 fi
 
 
-# cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash freetype_old.sh
+# cd ${rootPath}/plugins/php/lib && /bin/bash freetype_old.sh
 # OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype_old"
 # OPTIONS="${OPTIONS} --with-gd --enable-gd-native-ttf"
 # OPTIONS="${OPTIONS} --with-jpeg --with-jpeg-dir=/usr/lib"
@@ -60,7 +60,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 eaf62f66b..e8a887782 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 $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/intl.sh b/plugins/php/versions/common/intl.sh
index 02c2f7bb7..b616050a9 100755
--- a/plugins/php/versions/common/intl.sh
+++ b/plugins/php/versions/common/intl.sh
@@ -34,7 +34,7 @@ fi
 
 OPTIONS=''
 if [ "$version" -lt "71" ];then
-	cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash icu.sh
+	cd ${rootPath}/plugins/php/lib && /bin/bash icu.sh
 	OPTIONS="--with-icu-dir=${serverPath}/lib/icu"
 fi
 
diff --git a/plugins/php/versions/common/openssl.sh b/plugins/php/versions/common/openssl.sh
index 536db4a55..7fdf987f7 100755
--- a/plugins/php/versions/common/openssl.sh
+++ b/plugins/php/versions/common/openssl.sh
@@ -41,7 +41,7 @@ Install_lib()
 		return
 	fi
 	
-	# cd $serverPath/mdserver-web/plugins/php/lib && /bin/bash openssl_10.sh
+	# cd ${rootPath}/plugins/php/lib && /bin/bash openssl_10.sh
 	if [ "$version" -lt "70" ];then
 		cd ${rootPath}/plugins/php/lib && /bin/bash openssl_10.sh
 	fi
@@ -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/zip.sh b/plugins/php/versions/common/zip.sh
index d2bd49a26..828235592 100755
--- a/plugins/php/versions/common/zip.sh
+++ b/plugins/php/versions/common/zip.sh
@@ -54,7 +54,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}