From d0c64088781eed57a4ad069999a9532e26f07756 Mon Sep 17 00:00:00 2001 From: midoks Date: Wed, 6 Jul 2022 13:43:03 +0800 Subject: [PATCH] up --- plugins/mysql-ya/index.py | 4 +--- plugins/mysql-ya/install.sh | 5 +++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/plugins/mysql-ya/index.py b/plugins/mysql-ya/index.py index e57ab3f37..1e1b84108 100755 --- a/plugins/mysql-ya/index.py +++ b/plugins/mysql-ya/index.py @@ -163,7 +163,7 @@ def initDreplace(version=''): if mw.getOs() != 'darwin': mw.execShell('chown -R mysql mysql ' + getServerDir()) - return file_bin + return 'ok' def status(version=''): @@ -324,8 +324,6 @@ def initMysql8Pwd(): def my8cmd(version, method): # mysql 8.0 and 5.7 - init_file = initDreplace(version) - cmd = init_file + ' ' + method try: if version == '5.7': isInited = initMysql57Data() diff --git a/plugins/mysql-ya/install.sh b/plugins/mysql-ya/install.sh index 167c72cb0..dbe744aa0 100755 --- a/plugins/mysql-ya/install.sh +++ b/plugins/mysql-ya/install.sh @@ -9,6 +9,7 @@ serverPath=$(dirname "$rootPath") # cd /www/server/mdserver-web/plugins/mysql-ya && bash install.sh install 8.0 +# cd /www/server/mdserver-web && python3 /www/server/mdserver-web/plugins/mysql-ya/index.py start 8.0 install_tmp=${rootPath}/tmp/mw_install.pl @@ -33,6 +34,6 @@ sh -x $curPath/versions/$2/install.sh $1 # if [ "${action}" == "install" ];then # #初始化 -# cd ${rootPath} && python3 ${rootPath}/plugins/mysql/index.py start ${type} -# cd ${rootPath} && python3 ${rootPath}/plugins/mysql/index.py initd_install ${type} +# cd ${rootPath} && python3 ${rootPath}/plugins/mysql-ya/index.py start ${type} +# cd ${rootPath} && python3 ${rootPath}/plugins/mysql-ya/index.py initd_install ${type} # fi