From 19f9eb5da34c758f9d92d94876c799cd1b66a5c5 Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Mon, 1 Feb 2021 20:49:55 +0800
Subject: [PATCH] up

---
 plugins/mysql/versions/5.5/install.sh | 13 +++++++------
 plugins/mysql/versions/5.6/install.sh | 15 +++++++++------
 plugins/mysql/versions/5.7/install.sh | 13 +++++++------
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/plugins/mysql/versions/5.5/install.sh b/plugins/mysql/versions/5.5/install.sh
index d6ee50609..81f4d2271 100755
--- a/plugins/mysql/versions/5.5/install.sh
+++ b/plugins/mysql/versions/5.5/install.sh
@@ -9,7 +9,7 @@ curPath=`pwd`
 rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
-
+sysName=`uname`
 
 install_tmp=${rootPath}/tmp/mw_install.pl
 mysqlDir=${serverPath}/source/mysql
@@ -19,11 +19,12 @@ Install_mysql()
 	mkdir -p ${mysqlDir}
 	echo '正在安装脚本文件...' > $install_tmp
 
-	mkdir -p /var/log/mariadb
-	touch /var/log/mariadb/mariadb.log
-
-	groupadd mysql
-	useradd -g mysql mysql
+	if [ "$sysName" != "Darwin" ];then
+		mkdir -p /var/log/mariadb
+		touch /var/log/mariadb/mariadb.log
+		groupadd mysql
+		useradd -g mysql mysql
+	fi 
 
 	if [ ! -f ${mysqlDir}/mysql-5.5.62.tar.gz ];then
 		wget -O ${mysqlDir}/mysql-5.5.62.tar.gz https://dev.mysql.com/get/Downloads/MySQL-5.5/mysql-5.5.62.tar.gz
diff --git a/plugins/mysql/versions/5.6/install.sh b/plugins/mysql/versions/5.6/install.sh
index 772af21b6..4a03b716b 100755
--- a/plugins/mysql/versions/5.6/install.sh
+++ b/plugins/mysql/versions/5.6/install.sh
@@ -11,6 +11,7 @@ curPath=`pwd`
 rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
+sysName=`uname`
 
 
 install_tmp=${rootPath}/tmp/mw_install.pl
@@ -21,14 +22,16 @@ Install_mysql()
 	mkdir -p ${mysqlDir}
 	echo '正在安装脚本文件...' > $install_tmp
 
-	mkdir -p /var/log/mariadb
-	touch /var/log/mariadb/mariadb.log
-
-	groupadd mysql
-	useradd -g mysql mysql
+	if [ "$sysName" != "Darwin" ];then
+		mkdir -p /var/log/mariadb
+		touch /var/log/mariadb/mariadb.log
+		groupadd mysql
+		useradd -g mysql mysql
+	fi 
+	
 
 	if [ ! -f ${mysqlDir}/mysql-5.6.46.tar.gz ];then
-		wget -O ${mysqlDir}/mysql-5.6.46.tar.gz https://cdn.mysql.com//Downloads/MySQL-5.6/mysql-5.6.46.tar.gz
+		wget -O ${mysqlDir}/mysql-5.6.46.tar.gz https://cdn.mysql.com/Downloads/MySQL-5.6/mysql-5.6.46.tar.gz
 	fi
 
 	if [ ! -d ${mysqlDir}/mysql-5.6.46 ];then
diff --git a/plugins/mysql/versions/5.7/install.sh b/plugins/mysql/versions/5.7/install.sh
index d17f49437..948445174 100755
--- a/plugins/mysql/versions/5.7/install.sh
+++ b/plugins/mysql/versions/5.7/install.sh
@@ -11,7 +11,7 @@ curPath=`pwd`
 rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
-# sysName=`uname`
+sysName=`uname`
 
 
 install_tmp=${rootPath}/tmp/mw_install.pl
@@ -22,11 +22,12 @@ Install_mysql()
 	mkdir -p ${mysqlDir}
 	echo '正在安装脚本文件...' > $install_tmp
 
-	mkdir -p /var/log/mariadb
-	touch /var/log/mariadb/mariadb.log
-
-	groupadd mysql
-	useradd -g mysql mysql
+	if [ "$sysName" != "Darwin" ];then
+		mkdir -p /var/log/mariadb
+		touch /var/log/mariadb/mariadb.log
+		groupadd mysql
+		useradd -g mysql mysql
+	fi 
 
 	if [ ! -f ${mysqlDir}/mysql-boost-5.7.28.tar.gz ];then
 		wget -O ${mysqlDir}/mysql-boost-5.7.28.tar.gz https://cdn.mysql.com//Downloads/MySQL-5.7/mysql-boost-5.7.28.tar.gz