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 }