update

plugins/mariadb/install.sh

@@ -20,6 +20,14 @@ install_tmp=${rootPath}/tmp/mw_install.pl
 action=$1
 type=$2
 
+if id mysql &> /dev/null ;then 
+    echo "mysql UID is `id -u mysql`"
+    echo "mysql Shell is `grep "^mysql:" /etc/passwd |cut -d':' -f7 `"
+else
+    groupadd mysql
+	useradd -g mysql -s /usr/sbin/nologin mysql
+fi
+
 if [ "${2}" == "" ];then
 	echo '缺少安装脚本...' > $install_tmp
 	exit 0

plugins/mariadb/versions/10.11/install.sh

@@ -21,14 +21,6 @@ Install_app()
 	mkdir -p ${mariadbDir}
 	echo '正在安装脚本文件...' > $install_tmp
 
-	if id mysql &> /dev/null ;then 
-	    echo "mysql uid is `id -u www`"
-	    echo "mysql shell is `grep "^www:" /etc/passwd |cut -d':' -f7 `"
-	else
-	    groupadd mysql
-		useradd -g mysql mysql
-	fi
-
 	if [ "$sysName" != "Darwin" ];then
 		mkdir -p /var/log/mariadb
 		touch /var/log/mariadb/mariadb.log

plugins/mariadb/versions/10.6/install.sh

@@ -20,14 +20,6 @@ Install_app()
 	mkdir -p ${mariadbDir}
 	echo '正在安装脚本文件...' > $install_tmp
 
-	if id mysql &> /dev/null ;then 
-	    echo "mysql uid is `id -u www`"
-	    echo "mysql shell is `grep "^www:" /etc/passwd |cut -d':' -f7 `"
-	else
-	    groupadd mysql
-		useradd -g mysql mysql
-	fi
-
 	if [ "$sysName" != "Darwin" ];then
 		mkdir -p /var/log/mariadb
 		touch /var/log/mariadb/mariadb.log

plugins/mariadb/versions/10.7/install.sh

@@ -21,14 +21,6 @@ Install_app()
 	mkdir -p ${mariadbDir}
 	echo '正在安装脚本文件...' > $install_tmp
 
-	if id mysql &> /dev/null ;then 
-	    echo "mysql uid is `id -u www`"
-	    echo "mysql shell is `grep "^www:" /etc/passwd |cut -d':' -f7 `"
-	else
-	    groupadd mysql
-		useradd -g mysql mysql
-	fi
-
 	if [ "$sysName" != "Darwin" ];then
 		mkdir -p /var/log/mariadb
 		touch /var/log/mariadb/mariadb.log

plugins/mariadb/versions/10.8/install.sh

@@ -21,14 +21,6 @@ Install_app()
 	mkdir -p ${mariadbDir}
 	echo '正在安装脚本文件...' > $install_tmp
 
-	if id mysql &> /dev/null ;then 
-	    echo "mysql uid is `id -u www`"
-	    echo "mysql shell is `grep "^www:" /etc/passwd |cut -d':' -f7 `"
-	else
-	    groupadd mysql
-		useradd -g mysql mysql
-	fi
-
 	if [ "$sysName" != "Darwin" ];then
 		mkdir -p /var/log/mariadb
 		touch /var/log/mariadb/mariadb.log

plugins/mariadb/versions/10.9/install.sh

@@ -21,14 +21,6 @@ Install_app()
 	mkdir -p ${mariadbDir}
 	echo '正在安装脚本文件...' > $install_tmp
 
-	if id mysql &> /dev/null ;then 
-	    echo "mysql uid is `id -u www`"
-	    echo "mysql shell is `grep "^www:" /etc/passwd |cut -d':' -f7 `"
-	else
-	    groupadd mysql
-		useradd -g mysql mysql
-	fi
-
 	if [ "$sysName" != "Darwin" ];then
 		mkdir -p /var/log/mariadb
 		touch /var/log/mariadb/mariadb.log

plugins/mariadb/versions/11.0/install.sh

@@ -21,14 +21,6 @@ Install_app()
 	mkdir -p ${mariadbDir}
 	echo '正在安装脚本文件...' > $install_tmp
 
-	if id mysql &> /dev/null ;then 
-	    echo "mysql uid is `id -u www`"
-	    echo "mysql shell is `grep "^www:" /etc/passwd |cut -d':' -f7 `"
-	else
-	    groupadd mysql
-		useradd -g mysql mysql
-	fi
-
 	if [ "$sysName" != "Darwin" ];then
 		mkdir -p /var/log/mariadb
 		touch /var/log/mariadb/mariadb.log

plugins/mariadb/versions/11.1/install.sh

@@ -21,14 +21,6 @@ Install_app()
 	mkdir -p ${mariadbDir}
 	echo '正在安装脚本文件...' > $install_tmp
 
-	if id mysql &> /dev/null ;then 
-	    echo "mysql uid is `id -u www`"
-	    echo "mysql shell is `grep "^www:" /etc/passwd |cut -d':' -f7 `"
-	else
-	    groupadd mysql
-		useradd -g mysql mysql
-	fi
-
 	if [ "$sysName" != "Darwin" ];then
 		mkdir -p /var/log/mariadb
 		touch /var/log/mariadb/mariadb.log

plugins/mariadb/versions/11.2/install.sh

@@ -21,14 +21,6 @@ Install_app()
 	mkdir -p ${mariadbDir}
 	echo '正在安装脚本文件...' > $install_tmp
 
-	if id mysql &> /dev/null ;then 
-	    echo "mysql uid is `id -u www`"
-	    echo "mysql shell is `grep "^www:" /etc/passwd |cut -d':' -f7 `"
-	else
-	    groupadd mysql
-		useradd -g mysql mysql
-	fi
-
 	if [ "$sysName" != "Darwin" ];then
 		mkdir -p /var/log/mariadb
 		touch /var/log/mariadb/mariadb.log

plugins/mariadb/versions/11.3/install.sh

@@ -21,14 +21,6 @@ Install_app()
 	mkdir -p ${mariadbDir}
 	echo '正在安装脚本文件...' > $install_tmp
 
-	if id mysql &> /dev/null ;then 
-	    echo "mysql uid is `id -u www`"
-	    echo "mysql shell is `grep "^www:" /etc/passwd |cut -d':' -f7 `"
-	else
-	    groupadd mysql
-		useradd -g mysql mysql
-	fi
-
 	if [ "$sysName" != "Darwin" ];then
 		mkdir -p /var/log/mariadb
 		touch /var/log/mariadb/mariadb.log

plugins/mysql-apt/install.sh

@@ -21,6 +21,14 @@ install_tmp=${rootPath}/tmp/mw_install.pl
 action=$1
 type=$2
 
+if id mysql &> /dev/null ;then 
+    echo "mysql UID is `id -u mysql`"
+    echo "mysql Shell is `grep "^mysql:" /etc/passwd |cut -d':' -f7 `"
+else
+    groupadd mysql
+	useradd -g mysql -s /usr/sbin/nologin mysql
+fi
+
 
 if [ "${2}" == "" ];then
 	echo '缺少安装脚本...' > $install_tmp

plugins/mysql-apt/versions/5.7/install.sh

@@ -96,14 +96,6 @@ rm -rf $myDir
 Install_mysql()
 {
 	echo '正在安装脚本文件...' > $install_tmp
-	if id mysql &> /dev/null ;then 
-	    echo "mysql uid is `id -u mysql`"
-	    echo "mysql shell is `grep "^mysql:" /etc/passwd |cut -d':' -f7 `"
-	else
-	    groupadd mysql
-		useradd -g mysql mysql
-	fi
-
 
 	isApt=`which apt`
 	if [ "$isApt" != "" ];then

plugins/mysql-apt/versions/8.0/install.sh

@@ -101,13 +101,6 @@ rm -rf $myDir
 Install_mysql()
 {
 	echo '正在安装脚本文件...' > $install_tmp
-	if id mysql &> /dev/null ;then 
-	    echo "mysql uid is `id -u mysql`"
-	    echo "mysql shell is `grep "^mysql:" /etc/passwd |cut -d':' -f7 `"
-	else
-	    groupadd mysql
-		useradd -g mysql mysql
-	fi
 
 	isApt=`which apt`
 	if [ "$isApt" != "" ];then

plugins/mysql-apt/versions/8.2/install.sh

@@ -102,13 +102,6 @@ rm -rf $myDir
 Install_mysql()
 {
 	echo '正在安装脚本文件...' > $install_tmp
-	if id mysql &> /dev/null ;then 
-	    echo "mysql uid is `id -u mysql`"
-	    echo "mysql shell is `grep "^mysql:" /etc/passwd |cut -d':' -f7 `"
-	else
-	    groupadd mysql
-		useradd -g mysql mysql
-	fi
 
 	isApt=`which apt`
 	if [ "$isApt" != "" ];then

plugins/mysql-apt/versions/8.3/install.sh

@@ -100,13 +100,6 @@ rm -rf $myDir
 Install_mysql()
 {
 	echo '正在安装脚本文件...' > $install_tmp
-	if id mysql &> /dev/null ;then 
-	    echo "mysql uid is `id -u mysql`"
-	    echo "mysql shell is `grep "^mysql:" /etc/passwd |cut -d':' -f7 `"
-	else
-	    groupadd mysql
-		useradd -g mysql mysql
-	fi
 
 	isApt=`which apt`
 	if [ "$isApt" != "" ];then

plugins/mysql-apt/versions/8.4/install.sh

@@ -103,13 +103,6 @@ rm -rf $myDir
 Install_mysql()
 {
 	echo '正在安装脚本文件...' > $install_tmp
-	if id mysql &> /dev/null ;then 
-	    echo "mysql uid is `id -u mysql`"
-	    echo "mysql shell is `grep "^mysql:" /etc/passwd |cut -d':' -f7 `"
-	else
-	    groupadd mysql
-		useradd -g mysql mysql
-	fi
 
 	isApt=`which apt`
 	if [ "$isApt" != "" ];then

plugins/mysql-yum/install.sh

@@ -19,6 +19,14 @@ install_tmp=${rootPath}/tmp/mw_install.pl
 action=$1
 type=$2
 
+if id mysql &> /dev/null ;then 
+    echo "mysql UID is `id -u mysql`"
+    echo "mysql Shell is `grep "^mysql:" /etc/passwd |cut -d':' -f7 `"
+else
+    groupadd mysql
+	useradd -g mysql -s /usr/sbin/nologin mysql
+fi
+
 
 
 if [ "${2}" == "" ];then

plugins/mysql-yum/versions/5.7/install.sh

@@ -87,13 +87,6 @@ Install_mysql()
 {
 
 	echo '正在安装脚本文件...' > $install_tmp
-	if id mysql &> /dev/null ;then 
-	    echo "mysql uid is `id -u mysql`"
-	    echo "mysql shell is `grep "^mysql:" /etc/passwd |cut -d':' -f7 `"
-	else
-	    groupadd mysql
-		useradd -g mysql mysql
-	fi
 
 	mkdir -p $serverPath/mysql-yum
 

plugins/mysql-yum/versions/8.0/install.sh

@@ -84,16 +84,8 @@ Install_mysql()
 {
 
 	echo '正在安装脚本文件...' > $install_tmp
-	if id mysql &> /dev/null ;then 
-	    echo "mysql uid is `id -u mysql`"
-	    echo "mysql shell is `grep "^mysql:" /etc/passwd |cut -d':' -f7 `"
-	else
-	    groupadd mysql
-		useradd -g mysql mysql
-	fi
 
 	mkdir -p $serverPath/mysql-yum
-
 	mkdir -p /var/run/mysqld
 	chown mysql -R /var/run/mysqld
 

plugins/mysql-yum/versions/8.2/install.sh

@@ -85,13 +85,6 @@ Install_mysql()
 {
 
 	echo '正在安装脚本文件...' > $install_tmp
-	if id mysql &> /dev/null ;then 
-	    echo "mysql uid is `id -u mysql`"
-	    echo "mysql shell is `grep "^mysql:" /etc/passwd |cut -d':' -f7 `"
-	else
-	    groupadd mysql
-		useradd -g mysql mysql
-	fi
 
 	mkdir -p $serverPath/mysql-yum
 

plugins/mysql-yum/versions/8.3/install.sh

@@ -85,13 +85,6 @@ Install_mysql()
 {
 
 	echo '正在安装脚本文件...' > $install_tmp
-	if id mysql &> /dev/null ;then 
-	    echo "mysql uid is `id -u mysql`"
-	    echo "mysql shell is `grep "^mysql:" /etc/passwd |cut -d':' -f7 `"
-	else
-	    groupadd mysql
-		useradd -g mysql mysql
-	fi
 
 	mkdir -p $serverPath/mysql-yum
 

plugins/mysql-yum/versions/8.4/install.sh

@@ -89,14 +89,6 @@ Install_mysql()
 {
 
 	echo '正在安装脚本文件...' > $install_tmp
-	if id mysql &> /dev/null ;then 
-	    echo "mysql uid is `id -u mysql`"
-	    echo "mysql shell is `grep "^mysql:" /etc/passwd |cut -d':' -f7 `"
-	else
-	    groupadd mysql
-		useradd -g mysql mysql
-	fi
-
 	mkdir -p $serverPath/mysql-yum
 
 	mkdir -p /var/lib/mysql

plugins/mysql/install.sh

@@ -23,6 +23,14 @@ install_tmp=${rootPath}/tmp/mw_install.pl
 action=$1
 type=$2
 
+if id mysql &> /dev/null ;then 
+    echo "mysql UID is `id -u mysql`"
+    echo "mysql Shell is `grep "^mysql:" /etc/passwd |cut -d':' -f7 `"
+else
+    groupadd mysql
+	useradd -g mysql -s /usr/sbin/nologin mysql
+fi
+
 if [ "${2}" == "" ];then
 	echo '缺少安装脚本...' > $install_tmp
 	exit 0

plugins/mysql/versions/5.5/install.sh

@@ -21,14 +21,6 @@ Install_mysql()
 	mkdir -p ${mysqlDir}
 	echo '正在安装脚本文件...' > $install_tmp
 
-	if id mysql &> /dev/null ;then 
-	    echo "mysql UID is `id -u www`"
-	    echo "mysql Shell is `grep "^www:" /etc/passwd |cut -d':' -f7 `"
-	else
-	    groupadd mysql
-		useradd -g mysql mysql
-	fi
-
 	if [ "$sysName" != "Darwin" ];then
 		mkdir -p /var/log/mariadb
 		touch /var/log/mariadb/mariadb.log

plugins/mysql/versions/5.6/install.sh

@@ -22,14 +22,6 @@ Install_mysql()
 	mkdir -p ${mysqlDir}
 	echo '正在安装脚本文件...' > $install_tmp
 
-	if id mysql &> /dev/null ;then 
-	    echo "mysql UID is `id -u www`"
-	    echo "mysql Shell is `grep "^www:" /etc/passwd |cut -d':' -f7 `"
-	else
-	    groupadd mysql
-		useradd -g mysql mysql
-	fi
-
 	if [ "$sysName" != "Darwin" ];then
 		mkdir -p /var/log/mariadb
 		touch /var/log/mariadb/mariadb.log

plugins/mysql/versions/5.7/install.sh

@@ -24,14 +24,6 @@ Install_mysql()
 	mkdir -p ${mysqlDir}
 	echo '正在安装脚本文件...' > $install_tmp
 
-	if id mysql &> /dev/null ;then 
-	    echo "mysql UID is `id -u www`"
-	    echo "mysql Shell is `grep "^www:" /etc/passwd |cut -d':' -f7 `"
-	else
-	    groupadd mysql
-		useradd -g mysql mysql
-	fi
-
 	if [ "$sysName" != "Darwin" ];then
 		mkdir -p /var/log/mariadb
 		touch /var/log/mariadb/mariadb.log

plugins/mysql/versions/8.0/install.sh

@@ -62,15 +62,6 @@ Install_mysql()
 	mkdir -p ${mysqlDir}
 	echo '正在安装脚本文件...' > $install_tmp
 
-
-	if id mysql &> /dev/null ;then 
-	    echo "mysql UID is `id -u www`"
-	    echo "mysql Shell is `grep "^www:" /etc/passwd |cut -d':' -f7 `"
-	else
-	    groupadd mysql
-		useradd -g mysql mysql
-	fi
-
 	# ----- cpu start ------
 	if [ -z "${cpuCore}" ]; then
     	cpuCore="1"

plugins/mysql/versions/8.2/install.sh

@@ -62,15 +62,6 @@ Install_mysql()
 	mkdir -p ${mysqlDir}
 	echo '正在安装脚本文件...' > $install_tmp
 
-
-	if id mysql &> /dev/null ;then 
-	    echo "mysql UID is `id -u www`"
-	    echo "mysql Shell is `grep "^www:" /etc/passwd |cut -d':' -f7 `"
-	else
-	    groupadd mysql
-		useradd -g mysql mysql
-	fi
-
 	# ----- cpu start ------
 	if [ -z "${cpuCore}" ]; then
     	cpuCore="1"

plugins/mysql/versions/8.3/install.sh

@@ -62,15 +62,6 @@ Install_mysql()
 	mkdir -p ${mysqlDir}
 	echo '正在安装脚本文件...' > $install_tmp
 
-
-	if id mysql &> /dev/null ;then 
-	    echo "mysql UID is `id -u www`"
-	    echo "mysql Shell is `grep "^www:" /etc/passwd |cut -d':' -f7 `"
-	else
-	    groupadd mysql
-		useradd -g mysql mysql
-	fi
-
 	# ----- cpu start ------
 	if [ -z "${cpuCore}" ]; then
     	cpuCore="1"

plugins/mysql/versions/8.4/install.sh

@@ -65,14 +65,6 @@ Install_mysql()
 	echo '正在安装脚本文件...' > $install_tmp
 
 
-	if id mysql &> /dev/null ;then 
-	    echo "mysql UID is `id -u www`"
-	    echo "mysql Shell is `grep "^www:" /etc/passwd |cut -d':' -f7 `"
-	else
-	    groupadd mysql
-		useradd -g mysql mysql
-	fi
-
 	# ----- cpu start ------
 	if [ -z "${cpuCore}" ]; then
     	cpuCore="1"

scripts/install.sh

@@ -83,7 +83,7 @@ if [ $OSNAME != "macos" ];then
 	    echo ""
 	else
 	    groupadd www
-		useradd -g www -s /bin/bash www
+		useradd -g www -s /usr/sbin/nologin www
 	fi
 
 	mkdir -p /www/server