From ade2809a72b9bb40bc53ce2da120fde384f0e56c Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 11 Jun 2024 12:39:04 +0800
Subject: [PATCH] update

---
 plugins/php-apt/install.sh             | 30 ++++++++++++++------------
 plugins/php-apt/versions/56/install.sh |  2 +-
 plugins/php-apt/versions/70/install.sh |  2 +-
 plugins/php-apt/versions/71/install.sh |  2 +-
 plugins/php-apt/versions/72/install.sh |  2 +-
 plugins/php-apt/versions/73/install.sh |  2 +-
 plugins/php-apt/versions/74/install.sh |  2 +-
 plugins/php-apt/versions/80/install.sh |  2 +-
 plugins/php-apt/versions/82/install.sh |  2 +-
 plugins/php-apt/versions/83/install.sh |  2 +-
 10 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/plugins/php-apt/install.sh b/plugins/php-apt/install.sh
index b24a3483e..c975b2c18 100755
--- a/plugins/php-apt/install.sh
+++ b/plugins/php-apt/install.sh
@@ -75,7 +75,7 @@ fi
 cd ${curPath} && sh -x $curPath/versions/$2/install.sh $1
 
 if [ "${action}" == "install" ] && [ -d ${serverPath}/php-apt/${type} ];then
-
+	apt_ver=${type:0:1}.${type:1:2}
 	#初始化 
 	cd ${rootPath} && python3 ${rootPath}/plugins/php-apt/index.py start ${type}
 	cd ${rootPath} && python3 ${rootPath}/plugins/php-apt/index.py restart ${type}
@@ -83,19 +83,19 @@ if [ "${action}" == "install" ] && [ -d ${serverPath}/php-apt/${type} ];then
 
 	# 安装通用扩展
 	echo "install PHP-APT[${type}] extend start"
-	cd ${rootPath}/plugins/php-apt/versions && bash common.sh ${type:0:1}.${type:1:2} install curl
-	cd ${rootPath}/plugins/php-apt/versions && bash common.sh ${type:0:1}.${type:1:2} install gd
-	cd ${rootPath}/plugins/php-apt/versions && bash common.sh ${type:0:1}.${type:1:2} install iconv
-	cd ${rootPath}/plugins/php-apt/versions && bash common.sh ${type:0:1}.${type:1:2} install exif
-	cd ${rootPath}/plugins/php-apt/versions && bash common.sh ${type:0:1}.${type:1:2} install intl
-	cd ${rootPath}/plugins/php-apt/versions && bash common.sh ${type:0:1}.${type:1:2} install xml
-	cd ${rootPath}/plugins/php-apt/versions && bash common.sh ${type:0:1}.${type:1:2} install mcrypt
-	cd ${rootPath}/plugins/php-apt/versions && bash common.sh ${type:0:1}.${type:1:2} install mysqlnd
-	cd ${rootPath}/plugins/php-apt/versions && bash common.sh ${type:0:1}.${type:1:2} install mysql
-	cd ${rootPath}/plugins/php-apt/versions && bash common.sh ${type:0:1}.${type:1:2} install gettext
-	cd ${rootPath}/plugins/php-apt/versions && bash common.sh ${type:0:1}.${type:1:2} install redis
-	cd ${rootPath}/plugins/php-apt/versions && bash common.sh ${type:0:1}.${type:1:2} install memcached
-	cd ${rootPath}/plugins/php-apt/versions && bash common.sh ${type:0:1}.${type:1:2} install mbstring
+	cd ${rootPath}/plugins/php-apt/versions && bash common.sh ${apt_ver} install curl
+	cd ${rootPath}/plugins/php-apt/versions && bash common.sh ${apt_ver} install gd
+	cd ${rootPath}/plugins/php-apt/versions && bash common.sh ${apt_ver} install iconv
+	cd ${rootPath}/plugins/php-apt/versions && bash common.sh ${apt_ver} install exif
+	cd ${rootPath}/plugins/php-apt/versions && bash common.sh ${apt_ver} install intl
+	cd ${rootPath}/plugins/php-apt/versions && bash common.sh ${apt_ver} install xml
+	cd ${rootPath}/plugins/php-apt/versions && bash common.sh ${apt_ver} install mcrypt
+	cd ${rootPath}/plugins/php-apt/versions && bash common.sh ${apt_ver} install mysqlnd
+	cd ${rootPath}/plugins/php-apt/versions && bash common.sh ${apt_ver} install mysql
+	cd ${rootPath}/plugins/php-apt/versions && bash common.sh ${apt_ver} install gettext
+	cd ${rootPath}/plugins/php-apt/versions && bash common.sh ${apt_ver} install redis
+	cd ${rootPath}/plugins/php-apt/versions && bash common.sh ${apt_ver} install memcached
+	cd ${rootPath}/plugins/php-apt/versions && bash common.sh ${apt_ver} install mbstring
 	echo "install PHP-APT[${type}] extend end"
 
 	if [ ! -f /usr/local/bin/composer ];then
@@ -103,6 +103,8 @@ if [ "${action}" == "install" ] && [ -d ${serverPath}/php-apt/${type} ];then
 		curl -sS https://getcomposer.org/installer | /usr/bin/php${type:0:1}.${type:1:2}
 		mv composer.phar /usr/local/bin/composer
 	fi
+
+	systemctl restart php${apt_ver}-fpm
 fi
 
 
diff --git a/plugins/php-apt/versions/56/install.sh b/plugins/php-apt/versions/56/install.sh
index f31e4b864..7fc6788dc 100755
--- a/plugins/php-apt/versions/56/install.sh
+++ b/plugins/php-apt/versions/56/install.sh
@@ -39,7 +39,7 @@ Uninstall_php()
 #------------------------ uninstall start ------------------------------------#
 apt -y remove php${version} php${version}-*
 rm -rf $serverPath/php-apt/${PHP_VER}
-echo "卸载php-${version}..." > $install_tmp
+echo "卸载php-${version}..."
 #------------------------ uninstall start ------------------------------------#
 }
 
diff --git a/plugins/php-apt/versions/70/install.sh b/plugins/php-apt/versions/70/install.sh
index 39c0ce65b..ba1457a76 100755
--- a/plugins/php-apt/versions/70/install.sh
+++ b/plugins/php-apt/versions/70/install.sh
@@ -37,7 +37,7 @@ Uninstall_php()
 #------------------------ uninstall start ------------------------------------#
 apt -y remove php${version} php${version}-*
 rm -rf $serverPath/php-apt/${PHP_VER}
-echo "卸载php-${version}..." > $install_tmp
+echo "卸载php-${version}..."
 #------------------------ uninstall start ------------------------------------#
 }
 
diff --git a/plugins/php-apt/versions/71/install.sh b/plugins/php-apt/versions/71/install.sh
index 4cde2cb64..0af724652 100755
--- a/plugins/php-apt/versions/71/install.sh
+++ b/plugins/php-apt/versions/71/install.sh
@@ -37,7 +37,7 @@ Uninstall_php()
 #------------------------ uninstall start ------------------------------------#
 apt -y remove php${version} php${version}-*
 rm -rf $serverPath/php-apt/${PHP_VER}
-echo "卸载php-${version}..." > $install_tmp
+echo "卸载php-${version}..."
 #------------------------ uninstall start ------------------------------------#
 }
 
diff --git a/plugins/php-apt/versions/72/install.sh b/plugins/php-apt/versions/72/install.sh
index ce3d294c7..66bb3a74b 100755
--- a/plugins/php-apt/versions/72/install.sh
+++ b/plugins/php-apt/versions/72/install.sh
@@ -40,7 +40,7 @@ Uninstall_php()
 #------------------------ uninstall start ------------------------------------#
 apt -y remove php${version} php${version}-*
 rm -rf $serverPath/php-apt/${PHP_VER}
-echo "卸载php-${version}..." > $install_tmp
+echo "卸载php-${version}..."
 #------------------------ uninstall start ------------------------------------#
 }
 
diff --git a/plugins/php-apt/versions/73/install.sh b/plugins/php-apt/versions/73/install.sh
index f618a9011..e19cb1bb2 100755
--- a/plugins/php-apt/versions/73/install.sh
+++ b/plugins/php-apt/versions/73/install.sh
@@ -37,7 +37,7 @@ Uninstall_php()
 #------------------------ uninstall start ------------------------------------#
 apt -y remove php${version} php${version}-*
 rm -rf $serverPath/php-apt/${PHP_VER}
-echo "卸载php-${version}..." > $install_tmp
+echo "卸载php-${version}..."
 #------------------------ uninstall start ------------------------------------#
 }
 
diff --git a/plugins/php-apt/versions/74/install.sh b/plugins/php-apt/versions/74/install.sh
index 31eded735..f7852231f 100755
--- a/plugins/php-apt/versions/74/install.sh
+++ b/plugins/php-apt/versions/74/install.sh
@@ -37,7 +37,7 @@ Uninstall_php()
 #------------------------ uninstall start ------------------------------------#
 apt -y remove php${version} php${version}-*
 rm -rf $serverPath/php-apt/${PHP_VER}
-echo "卸载php-${version}..." > $install_tmp
+echo "卸载php-${version}..."
 #------------------------ uninstall start ------------------------------------#
 }
 
diff --git a/plugins/php-apt/versions/80/install.sh b/plugins/php-apt/versions/80/install.sh
index 838c67ca0..a3d86c9b9 100755
--- a/plugins/php-apt/versions/80/install.sh
+++ b/plugins/php-apt/versions/80/install.sh
@@ -37,7 +37,7 @@ Uninstall_php()
 #------------------------ uninstall start ------------------------------------#
 apt -y remove php${version} php${version}-*
 rm -rf $serverPath/php-apt/${PHP_VER}
-echo "卸载php-${version}..." > $install_tmp
+echo "卸载php-${version}..." >
 #------------------------ uninstall start ------------------------------------#
 }
 
diff --git a/plugins/php-apt/versions/82/install.sh b/plugins/php-apt/versions/82/install.sh
index 3d9765168..bab78a3d1 100755
--- a/plugins/php-apt/versions/82/install.sh
+++ b/plugins/php-apt/versions/82/install.sh
@@ -37,7 +37,7 @@ Uninstall_php()
 #------------------------ uninstall start ------------------------------------#
 apt -y remove php${version} php${version}-*
 rm -rf $serverPath/php-apt/${PHP_VER}
-echo "卸载php-${version}..." > $install_tmp
+echo "卸载php-${version}..."
 #------------------------ uninstall start ------------------------------------#
 }
 
diff --git a/plugins/php-apt/versions/83/install.sh b/plugins/php-apt/versions/83/install.sh
index adce1b9a2..d1ee9485a 100755
--- a/plugins/php-apt/versions/83/install.sh
+++ b/plugins/php-apt/versions/83/install.sh
@@ -37,7 +37,7 @@ Uninstall_php()
 #------------------------ uninstall start ------------------------------------#
 apt -y remove php${version} php${version}-*
 rm -rf $serverPath/php-apt/${PHP_VER}
-echo "卸载php-${version}..." > $install_tmp
+echo "卸载php-${version}..."
 #------------------------ uninstall start ------------------------------------#
 }