From 0a65539ddc44bd9d50421289d942b9e8dd5065ea Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Mon, 27 Jun 2022 18:49:24 +0800
Subject: [PATCH] up

---
 plugins/php/versions/53/install.sh | 6 +-----
 plugins/php/versions/54/install.sh | 5 +----
 plugins/php/versions/55/install.sh | 7 +------
 plugins/php/versions/56/install.sh | 5 +----
 plugins/php/versions/70/install.sh | 7 +------
 plugins/php/versions/71/install.sh | 5 +----
 plugins/php/versions/72/install.sh | 5 +----
 plugins/php/versions/73/install.sh | 5 +----
 plugins/php/versions/74/install.sh | 5 +----
 plugins/php/versions/80/install.sh | 6 +-----
 plugins/php/versions/81/install.sh | 6 +-----
 11 files changed, 11 insertions(+), 51 deletions(-)

diff --git a/plugins/php/versions/53/install.sh b/plugins/php/versions/53/install.sh
index 92d398c12..a948a1ffa 100755
--- a/plugins/php/versions/53/install.sh
+++ b/plugins/php/versions/53/install.sh
@@ -52,10 +52,6 @@ else
 fi
 
 
-# 加快测试速度 For Github Action
-MAKEJN="${MAKEJN:--j2}"
-echo "MAKEJN:$MAKEJN"
-
 if [ ! -d $serverPath/php/53 ];then
 	cd $sourcePath/php/php${PHP_VER} && ./configure \
 	--prefix=$serverPath/php/53 \
@@ -89,7 +85,7 @@ if [ ! -d $serverPath/php/53 ];then
 	--disable-fileinfo \
 	$OPTIONS \
 	--enable-fpm
-	make clean && make $MAKEJN && make install && make clean
+	make clean && make ${MAKEJN:--j2} && make install && make clean
 fi
 
 
diff --git a/plugins/php/versions/54/install.sh b/plugins/php/versions/54/install.sh
index b89972932..c1213fd64 100755
--- a/plugins/php/versions/54/install.sh
+++ b/plugins/php/versions/54/install.sh
@@ -45,9 +45,6 @@ else
 	OPTIONS="${OPTIONS} --with-curl"
 fi
 
-# 加快测试速度 For Github Action
-MAKEJN="${MAKEJN:--j2}"
-echo "MAKEJN:$MAKEJN"
 
 if [ ! -d $serverPath/php/${PHP_VER} ];then
 	cd $sourcePath/php/php${PHP_VER} && ./configure \
@@ -73,7 +70,7 @@ if [ ! -d $serverPath/php/${PHP_VER} ];then
 	$OPTIONS \
 	--enable-fpm
 
-	make clean && make $MAKEJN
+	make clean && make ${MAKEJN:--j2}
 
 	#debian11,没有生成php54 man
 	if [ ! -f sapi/cli/php.1 ];then
diff --git a/plugins/php/versions/55/install.sh b/plugins/php/versions/55/install.sh
index 3c370e396..b03848920 100755
--- a/plugins/php/versions/55/install.sh
+++ b/plugins/php/versions/55/install.sh
@@ -44,11 +44,6 @@ else
 	OPTIONS="${OPTIONS} --with-curl"
 fi
 
-# 加快测试速度 For Github Action
-MAKEJN="${SYS_MAKEJN:-'-j1'}"
-echo "SYS_MAKEJN:$MAKEJN"
-
-
 if [ ! -d $serverPath/php/55  ];then
 	cd $sourcePath/php/php${PHP_VER} && ./configure \
 	--prefix=$serverPath/php/55 \
@@ -73,7 +68,7 @@ if [ ! -d $serverPath/php/55  ];then
 	--disable-fileinfo \
 	$OPTIONS \
 	--enable-fpm
-	make clean && make $MAKEJN && make install && make clean
+	make clean && make ${MAKEJN:--j2} && make install && make clean
 fi
 
 #------------------------ install end ------------------------------------#
diff --git a/plugins/php/versions/56/install.sh b/plugins/php/versions/56/install.sh
index 9120b5c05..046015744 100755
--- a/plugins/php/versions/56/install.sh
+++ b/plugins/php/versions/56/install.sh
@@ -44,9 +44,6 @@ else
 	OPTIONS="${OPTIONS} --with-curl"
 fi
 
-# 加快测试速度 For Github Action
-MAKEJN="${SYS_MAKEJN:-'-j2'}"
-echo "SYS_MAKEJN:$MAKEJN"
 
 if [ ! -d $serverPath/php/56 ];then
 	cd $sourcePath/php/php${PHP_VER} && ./configure \
@@ -74,7 +71,7 @@ if [ ! -d $serverPath/php/56 ];then
 	--disable-fileinfo \
 	$OPTIONS \
 	--enable-fpm
-	make clean && make $MAKEJN && make install && make clean
+	make clean && make ${MAKEJN:--j2} && make install && make clean
 fi 
 
 #------------------------ install end ------------------------------------#
diff --git a/plugins/php/versions/70/install.sh b/plugins/php/versions/70/install.sh
index 37428c787..75203d880 100755
--- a/plugins/php/versions/70/install.sh
+++ b/plugins/php/versions/70/install.sh
@@ -44,11 +44,6 @@ else
 	OPTIONS="${OPTIONS} --with-curl"
 fi
 
-
-# 加快测试速度 For Github Action
-MAKEJN="${SYS_MAKEJN:-'-j2'}"
-echo "SYS_MAKEJN:$MAKEJN"
-
 if [ ! -d $serverPath/php/70 ];then
 	cd $sourcePath/php/php${PHP_VER} && ./configure \
 	--prefix=$serverPath/php/70 \
@@ -72,7 +67,7 @@ if [ ! -d $serverPath/php/70 ];then
 	--disable-fileinfo \
 	$OPTIONS \
 	--enable-fpm
-	make clean && make $MAKEJN && make install && make clean
+	make clean && make ${MAKEJN:--j2} && make install && make clean
 fi
 
 #------------------------ install end ------------------------------------#
diff --git a/plugins/php/versions/71/install.sh b/plugins/php/versions/71/install.sh
index cde6f2f80..60f315b7d 100755
--- a/plugins/php/versions/71/install.sh
+++ b/plugins/php/versions/71/install.sh
@@ -43,9 +43,6 @@ else
 	OPTIONS="${OPTIONS} --with-curl"
 fi
 
-# 加快测试速度 For Github Action
-MAKEJN="${SYS_MAKEJN:-'-j2'}"
-echo "SYS_MAKEJN:$MAKEJN"
 
 if [ ! -d $serverPath/php/71 ];then
 	cd $sourcePath/php/php${PHP_VER} && ./configure \
@@ -70,7 +67,7 @@ if [ ! -d $serverPath/php/71 ];then
 	--disable-fileinfo \
 	$OPTIONS \
 	--enable-fpm
-	make clean && make $MAKEJN && make install && make clean
+	make clean && make ${MAKEJN:--j2} && make install && make clean
 fi
 
 #------------------------ install end ------------------------------------#
diff --git a/plugins/php/versions/72/install.sh b/plugins/php/versions/72/install.sh
index 66cb71f10..ccde35e98 100755
--- a/plugins/php/versions/72/install.sh
+++ b/plugins/php/versions/72/install.sh
@@ -44,9 +44,6 @@ else
 	OPTIONS="${OPTIONS} --with-curl"
 fi
 
-# 加快测试速度 For Github Action
-MAKEJN="${MAKEJN:--j2}"
-echo "MAKEJN:$MAKEJN"
 
 if [ ! -d $serverPath/php/72 ];then
 	cd $sourcePath/php/php${PHP_VER} && ./configure \
@@ -71,7 +68,7 @@ if [ ! -d $serverPath/php/72 ];then
 	--disable-fileinfo \
 	$OPTIONS \
 	--enable-fpm
-	make clean && make $MAKEJN && make install && make clean
+	make clean && make ${MAKEJN:--j2} && make install && make clean
 fi
 
 #------------------------ install end ------------------------------------#
diff --git a/plugins/php/versions/73/install.sh b/plugins/php/versions/73/install.sh
index 89c613228..80a2bf98f 100755
--- a/plugins/php/versions/73/install.sh
+++ b/plugins/php/versions/73/install.sh
@@ -49,9 +49,6 @@ else
 	OPTIONS="${OPTIONS} --with-libzip=${serverPath}/lib/libzip"
 fi
 
-# 加快测试速度 For Github Action
-MAKEJN="${SYS_MAKEJN:-'-j2'}"
-echo "SYS_MAKEJN:$MAKEJN"
 
 if [ ! -d $serverPath/php/73 ];then
 	cd $sourcePath/php/php${PHP_VER} && ./configure \
@@ -75,7 +72,7 @@ if [ ! -d $serverPath/php/73 ];then
 	--disable-fileinfo \
 	$OPTIONS \
 	--enable-fpm
-	make clean && make $MAKEJN && make install && make clean
+	make clean && make ${MAKEJN:--j2} && make install && make clean
 fi
 
 #------------------------ install end ------------------------------------#
diff --git a/plugins/php/versions/74/install.sh b/plugins/php/versions/74/install.sh
index c2c2c2b54..1163b2816 100755
--- a/plugins/php/versions/74/install.sh
+++ b/plugins/php/versions/74/install.sh
@@ -53,9 +53,6 @@ else
 fi
 
 
-# 加快测试速度 For Github Action
-MAKEJN="${SYS_MAKEJN:-'-j2'}"
-echo "SYS_MAKEJN:$MAKEJN"
 
 echo "$sourcePath/php/php${PHP_VER}"
 
@@ -83,7 +80,7 @@ if [ ! -d $serverPath/php/${PHP_VER} ];then
 	--disable-fileinfo \
 	$OPTIONS \
 	--enable-fpm
-	make $MAKEJN && make install && make clean
+	make ${MAKEJN:--j2} && make install && make clean
 fi 
 #------------------------ install end ------------------------------------#
 }
diff --git a/plugins/php/versions/80/install.sh b/plugins/php/versions/80/install.sh
index 21ee1e238..cae7224d9 100755
--- a/plugins/php/versions/80/install.sh
+++ b/plugins/php/versions/80/install.sh
@@ -52,10 +52,6 @@ else
 	OPTIONS="${OPTIONS} --with-curl"
 fi
 
-# 加快测试速度 For Github Action
-MAKEJN="${SYS_MAKEJN:-'-j2'}"
-echo "SYS_MAKEJN:$MAKEJN"
-
 echo "$sourcePath/php/php${PHP_VER}"
 
 if [ ! -d $serverPath/php/${PHP_VER} ];then
@@ -82,7 +78,7 @@ if [ ! -d $serverPath/php/${PHP_VER} ];then
 	--disable-fileinfo \
 	$OPTIONS \
 	--enable-fpm
-	make clean && make $MAKEJN && make install && make clean
+	make clean && make ${MAKEJN:--j2} && make install && make clean
 fi 
 #------------------------ install end ------------------------------------#
 }
diff --git a/plugins/php/versions/81/install.sh b/plugins/php/versions/81/install.sh
index db60546a8..5da41f15d 100755
--- a/plugins/php/versions/81/install.sh
+++ b/plugins/php/versions/81/install.sh
@@ -57,10 +57,6 @@ else
 fi
 
 
-# 加快测试速度 For Github Action
-MAKEJN="${SYS_MAKEJN:-'-j2'}"
-echo "SYS_MAKEJN:$MAKEJN"
-
 echo "$sourcePath/php/php${PHP_VER}"
 
 if [ ! -d $serverPath/php/${PHP_VER} ];then
@@ -87,7 +83,7 @@ if [ ! -d $serverPath/php/${PHP_VER} ];then
 	--disable-fileinfo \
 	$OPTIONS \
 	--enable-fpm
-	make clean && make $MAKEJN && make install && make clean
+	make clean && make ${MAKEJN:--j2} && make install && make clean
 fi 
 #------------------------ install end ------------------------------------#
 }