From 2edc467b17850cb1b6566970cb2ff30fc03c8e27 Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Thu, 30 Jun 2022 12:23:12 +0800
Subject: [PATCH] =?UTF-8?q?mysql=E5=AE=89=E8=A3=85=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=BA=90=E6=96=87=E4=BB=B6=EF=BC=8C=E9=81=BF?=
 =?UTF-8?q?=E5=85=8D=E9=87=8D=E5=AE=89=E8=A3=85=E6=97=B6=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/mysql/install.sh              |  2 +-
 plugins/mysql/versions/5.5/install.sh |  1 +
 plugins/mysql/versions/5.6/install.sh |  1 +
 plugins/mysql/versions/5.7/install.sh | 10 ++++++++--
 plugins/mysql/versions/8.0/install.sh |  5 ++++-
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/plugins/mysql/install.sh b/plugins/mysql/install.sh
index 2f25111c9..aa36df47e 100755
--- a/plugins/mysql/install.sh
+++ b/plugins/mysql/install.sh
@@ -36,7 +36,7 @@ fi
 
 sh -x $curPath/versions/$2/install.sh $1
 
-if [ "${action}" == "install" ];then
+if [ "${action}" == "install" ] && [ -d $serverPath/mysql ];then
 	#初始化 
 	cd ${rootPath} && python3 ${rootPath}/plugins/mysql/index.py start ${type}
 	cd ${rootPath} && python3 ${rootPath}/plugins/mysql/index.py initd_install ${type}
diff --git a/plugins/mysql/versions/5.5/install.sh b/plugins/mysql/versions/5.5/install.sh
index 6150ef87c..b7d0a257d 100755
--- a/plugins/mysql/versions/5.5/install.sh
+++ b/plugins/mysql/versions/5.5/install.sh
@@ -64,6 +64,7 @@ Install_mysql()
 			echo '5.5' > $serverPath/mysql/version.pl
 			echo '安装完成' > $install_tmp
 		else
+			rm -rf ${mysqlDir}/mysql-5.5.62
 			echo '安装失败' > $install_tmp
 		fi
 	fi
diff --git a/plugins/mysql/versions/5.6/install.sh b/plugins/mysql/versions/5.6/install.sh
index b4392f034..4937df5aa 100755
--- a/plugins/mysql/versions/5.6/install.sh
+++ b/plugins/mysql/versions/5.6/install.sh
@@ -69,6 +69,7 @@ Install_mysql()
 			echo '5.6' > $serverPath/mysql/version.pl
 			echo '安装完成' > $install_tmp
 		else
+			rm -rf ${mysqlDir}/mysql-5.6.50
 			echo '安装失败' > $install_tmp
 		fi
 	fi
diff --git a/plugins/mysql/versions/5.7/install.sh b/plugins/mysql/versions/5.7/install.sh
index f41cc2ca3..b95f7a311 100755
--- a/plugins/mysql/versions/5.7/install.sh
+++ b/plugins/mysql/versions/5.7/install.sh
@@ -79,8 +79,14 @@ Install_mysql()
 		-DCMAKE_CXX_COMPILER=/usr/bin/g++ \
 		-DWITH_BOOST=${mysqlDir}/mysql-${VERSION}/boost/
 		make clean && make && make install && make clean
-		echo '5.7' > $serverPath/mysql/version.pl
-		echo '安装完成' > $install_tmp
+
+		if [ -d $serverPath/mysql ];then
+			echo '5.7' > $serverPath/mysql/version.pl
+			echo '安装完成' > $install_tmp
+		else
+			rm -rf ${mysqlDir}/mysql-${VERSION}
+			echo '安装失败' > $install_tmp
+		fi
 	fi
 }
 
diff --git a/plugins/mysql/versions/8.0/install.sh b/plugins/mysql/versions/8.0/install.sh
index e6617ce89..9603b6d4b 100755
--- a/plugins/mysql/versions/8.0/install.sh
+++ b/plugins/mysql/versions/8.0/install.sh
@@ -83,8 +83,11 @@ Install_mysql()
 
 		if [ -d $serverPath/mysql ];then
 			echo '8.0' > $serverPath/mysql/version.pl
+			echo '安装完成' > $install_tmp
+		else
+			rm -rf ${mysqlDir}/mysql-8.0.25
+			echo '安装失败' > $install_tmp
 		fi
-		echo '安装完成' > $install_tmp
 	fi
 }