From c58d4e69dc652e2b1b66c847683ea3f0b508d6ed Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Mon, 27 Jun 2022 18:47:15 +0800
Subject: [PATCH] up

---
 plugins/mysql/versions/5.5/install.sh | 6 +-----
 plugins/mysql/versions/5.6/install.sh | 6 +-----
 plugins/mysql/versions/5.7/install.sh | 5 +----
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/plugins/mysql/versions/5.5/install.sh b/plugins/mysql/versions/5.5/install.sh
index ea5dad6bb..659912f7c 100755
--- a/plugins/mysql/versions/5.5/install.sh
+++ b/plugins/mysql/versions/5.5/install.sh
@@ -15,10 +15,6 @@ install_tmp=${rootPath}/tmp/mw_install.pl
 mysqlDir=${serverPath}/source/mysql
 
 
-# 加快测试速度 For Github Action
-MAKEJN="${MAKEJN:--j2}"
-echo "MAKEJN:$MAKEJN"
-
 Install_mysql()
 {
 	mkdir -p ${mysqlDir}
@@ -62,7 +58,7 @@ Install_mysql()
 		-DDEFAULT_COLLATION=utf8mb4_general_ci \
 		-DCMAKE_C_COMPILER=/usr/bin/gcc \
 		-DCMAKE_CXX_COMPILER=/usr/bin/g++ \
-		&& make $MAKEJN && make install && make clean
+		&& make ${MAKEJN:--j2} && make install && make clean
 
 		if [ -d $serverPath/mysql ];then
 			echo '5.5' > $serverPath/mysql/version.pl
diff --git a/plugins/mysql/versions/5.6/install.sh b/plugins/mysql/versions/5.6/install.sh
index 6182fcbae..31f193176 100755
--- a/plugins/mysql/versions/5.6/install.sh
+++ b/plugins/mysql/versions/5.6/install.sh
@@ -18,10 +18,6 @@ install_tmp=${rootPath}/tmp/mw_install.pl
 mysqlDir=${serverPath}/source/mysql
 
 
-# 加快测试速度 For Github Action
-MAKEJN="${MAKEJN:--j2}"
-echo "MAKEJN:$MAKEJN"
-
 Install_mysql()
 {
 	mkdir -p ${mysqlDir}
@@ -66,7 +62,7 @@ Install_mysql()
 		-DCMAKE_C_COMPILER=/usr/bin/gcc \
 		-DCMAKE_CXX_COMPILER=/usr/bin/g++ \
 		-DDEFAULT_COLLATION=utf8mb4_general_ci \
-		&& make $MAKEJN && make install && make clean
+		&& make ${MAKEJN:--j2} && make install && make clean
 
 
 		if [ -d $serverPath/mysql ];then
diff --git a/plugins/mysql/versions/5.7/install.sh b/plugins/mysql/versions/5.7/install.sh
index 06e099629..76376cb9a 100755
--- a/plugins/mysql/versions/5.7/install.sh
+++ b/plugins/mysql/versions/5.7/install.sh
@@ -19,9 +19,6 @@ mysqlDir=${serverPath}/source/mysql
 
 VERSION="5.7.37"
 
-# 加快测试速度 For Github Action
-MAKEJN="${MAKEJN:--j2}"
-echo "MAKEJN:$MAKEJN"
 
 Install_mysql()
 {
@@ -81,7 +78,7 @@ Install_mysql()
 		-DCMAKE_C_COMPILER=/usr/bin/gcc \
 		-DCMAKE_CXX_COMPILER=/usr/bin/g++ \
 		-DWITH_BOOST=${mysqlDir}/mysql-${VERSION}/boost/
-		make $MAKEJN && make install && make clean
+		make ${MAKEJN:--j2} && make install && make clean
 		echo '5.7' > $serverPath/mysql/version.pl
 		echo '安装完成' > $install_tmp
 	fi