diff --git a/plugins/mysql/versions/5.5/install.sh b/plugins/mysql/versions/5.5/install.sh index 526931550..975e22534 100755 --- a/plugins/mysql/versions/5.5/install.sh +++ b/plugins/mysql/versions/5.5/install.sh @@ -19,11 +19,17 @@ 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 - groupadd mysql - useradd -g mysql mysql fi if [ ! -f ${mysqlDir}/mysql-5.5.62.tar.gz ];then diff --git a/plugins/mysql/versions/5.6/install.sh b/plugins/mysql/versions/5.6/install.sh index 11eb87293..197b006cd 100755 --- a/plugins/mysql/versions/5.6/install.sh +++ b/plugins/mysql/versions/5.6/install.sh @@ -22,11 +22,17 @@ 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 - groupadd mysql - useradd -g mysql mysql fi diff --git a/plugins/mysql/versions/5.7/install.sh b/plugins/mysql/versions/5.7/install.sh index 3083dcc4b..f86048a6f 100755 --- a/plugins/mysql/versions/5.7/install.sh +++ b/plugins/mysql/versions/5.7/install.sh @@ -24,12 +24,19 @@ 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 - groupadd mysql - useradd -g mysql mysql - fi + fi + if [ ! -f ${mysqlDir}/mysql-boost-${VERSION}.tar.gz ];then wget -O ${mysqlDir}/mysql-boost-${VERSION}.tar.gz https://cdn.mysql.com/Downloads/MySQL-5.7/mysql-boost-${VERSION}.tar.gz @@ -37,8 +44,8 @@ Install_mysql() #检测文件是否损坏. md5_mysql_ok=d0489fc3880248a58759c50bfb286dbb - if [ -f ${mysqlDir}/mysql-boost-${VERSION}.tar.gz; ];then - md5_mysql=`md5sum mysql-boost-${VERSION}.tar.gz | awk '{print $1}'` + if [ -f ${mysqlDir}/mysql-boost-${VERSION}.tar.gz ];then + md5_mysql=`md5sum ${mysqlDir}/mysql-boost-${VERSION}.tar.gz | awk '{print $1}'` if [ "${md5_mysql_ok}" == "${md5_mysql}" ]; then echo "mysql5.7 file check ok" else diff --git a/plugins/mysql/versions/8.0/install.sh b/plugins/mysql/versions/8.0/install.sh index 9c5fba2e2..603a39a44 100755 --- a/plugins/mysql/versions/8.0/install.sh +++ b/plugins/mysql/versions/8.0/install.sh @@ -22,13 +22,19 @@ 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 + INSTALL_CMD=cmake if [ "$sysName" != "Darwin" ];then mkdir -p /var/log/mariadb touch /var/log/mariadb/mariadb.log - groupadd mysql - useradd -g mysql mysql - INSTALL_CMD=cmake fi @@ -38,8 +44,8 @@ Install_mysql() #检测文件是否损坏. md5_mysql_ok=e142c2058313b4646c36fa9bb1b38493 - if [ -f ${mysqlDir}/mysql-boost-8.0.25.tar.gz; ];then - md5_mysql=`md5sum mysql-boost-8.0.25.tar.gz | awk '{print $1}'` + if [ -f ${mysqlDir}/mysql-boost-8.0.25.tar.gz ];then + md5_mysql=`md5sum ${mysqlDir}/mysql-boost-8.0.25.tar.gz | awk '{print $1}'` if [ "${md5_mysql_ok}" == "${md5_mysql}" ]; then echo "mysql8.0 file check ok" else @@ -54,8 +60,6 @@ Install_mysql() fi - - if [ ! -d $serverPath/mysql ];then cd ${mysqlDir}/mysql-8.0.25 && ${INSTALL_CMD} \ -DCMAKE_INSTALL_PREFIX=$serverPath/mysql \