diff --git a/plugins/mariadb/versions/10.6/install.sh b/plugins/mariadb/versions/10.6/install.sh index aebef2f9f..9b7e522dc 100755 --- a/plugins/mariadb/versions/10.6/install.sh +++ b/plugins/mariadb/versions/10.6/install.sh @@ -21,8 +21,8 @@ Install_app() 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 `" + 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 @@ -59,13 +59,13 @@ Install_app() # ----- cpu end ------ # https://mirrors.aliyun.com/mariadb/mariadb-10.8.3/source/mariadb-10.8.3.tar.gz - if [ ! -f ${mariadbDir}/mariadb-${MY_VER}.tar.gz ];then - wget --no-check-certificate -O ${mariadbDir}/mariadb-${MY_VER}.tar.gz --tries=3 https://mirrors.aliyun.com/mariadb/mariadb-${MY_VER}/source/mariadb-${MY_VER}.tar.gz + # if [ ! -f ${mariadbDir}/mariadb-${MY_VER}.tar.gz ];then + # wget --no-check-certificate -O ${mariadbDir}/mariadb-${MY_VER}.tar.gz --tries=3 https://mirrors.aliyun.com/mariadb/mariadb-${MY_VER}/source/mariadb-${MY_VER}.tar.gz - fi + # fi # https://downloads.mariadb.org/interstitial/mariadb-10.6.8/source/mariadb-10.6.8.tar.gz - if [ "$?" != "0" ];then + if [ ! -f ${mariadbDir}/mariadb-${MY_VER}.tar.gz ];then wget --no-check-certificate -O ${mariadbDir}/mariadb-${MY_VER}.tar.gz --tries=3 https://archive.mariadb.org/mariadb-${MY_VER}/source/mariadb-${MY_VER}.tar.gz fi @@ -107,12 +107,14 @@ Install_app() echo '10.6' > $serverPath/mariadb/version.pl echo '安装完成' > $install_tmp else - # rm -rf ${mariadbDir}/mariadb-${MY_VER} echo '安装失败' > $install_tmp echo 'install fail'>&2 exit 1 fi fi + + rm -rf ${mariadbDir}/mariadb-${MY_VER} + rm -rf ${mariadbDir}/mariadb-${MY_VER}.tar.gz } Uninstall_app() diff --git a/plugins/mariadb/versions/10.7/install.sh b/plugins/mariadb/versions/10.7/install.sh index 07b34fca1..ea02e3c16 100755 --- a/plugins/mariadb/versions/10.7/install.sh +++ b/plugins/mariadb/versions/10.7/install.sh @@ -22,8 +22,8 @@ Install_app() 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 `" + 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 @@ -59,12 +59,12 @@ Install_app() fi # ----- cpu end ------ - if [ ! -f ${mariadbDir}/mariadb-${MY_VER}.tar.gz ];then - wget --no-check-certificate -O ${mariadbDir}/mariadb-${MY_VER}.tar.gz --tries=3 https://mirrors.aliyun.com/mariadb/mariadb-${MY_VER}/source/mariadb-${MY_VER}.tar.gz - fi + # if [ ! -f ${mariadbDir}/mariadb-${MY_VER}.tar.gz ];then + # wget --no-check-certificate -O ${mariadbDir}/mariadb-${MY_VER}.tar.gz --tries=3 https://mirrors.aliyun.com/mariadb/mariadb-${MY_VER}/source/mariadb-${MY_VER}.tar.gz + # fi # https://downloads.mariadb.org/interstitial/mariadb-10.7.4/source/mariadb-10.7.4.tar.gz - if [ "$?" != "0" ];then + if [ ! -f ${mariadbDir}/mariadb-${MY_VER}.tar.gz ];then wget --no-check-certificate -O ${mariadbDir}/mariadb-${MY_VER}.tar.gz --tries=3 https://archive.mariadb.org/mariadb-${MY_VER}/source/mariadb-${MY_VER}.tar.gz fi @@ -94,12 +94,14 @@ Install_app() echo '10.7' > $serverPath/mariadb/version.pl echo '安装完成' > $install_tmp else - # rm -rf ${mariadbDir}/mariadb-${MY_VER} echo '安装失败' > $install_tmp echo 'install fail'>&2 exit 1 fi fi + + rm -rf ${mariadbDir}/mariadb-${MY_VER} + rm -rf ${mariadbDir}/mariadb-${MY_VER}.tar.gz } Uninstall_app() diff --git a/plugins/mariadb/versions/10.8/install.sh b/plugins/mariadb/versions/10.8/install.sh index 58166e1e3..7c3a880a3 100755 --- a/plugins/mariadb/versions/10.8/install.sh +++ b/plugins/mariadb/versions/10.8/install.sh @@ -22,8 +22,8 @@ Install_app() 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 `" + 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 @@ -59,11 +59,11 @@ Install_app() fi # ----- cpu end ------ - if [ ! -f ${mariadbDir}/mariadb-${MY_VER}.tar.gz ];then - wget --no-check-certificate -O ${mariadbDir}/mariadb-${MY_VER}.tar.gz --tries=3 https://mirrors.aliyun.com/mariadb/mariadb-${MY_VER}/source/mariadb-${MY_VER}.tar.gz - fi + # if [ ! -f ${mariadbDir}/mariadb-${MY_VER}.tar.gz ];then + # wget --no-check-certificate -O ${mariadbDir}/mariadb-${MY_VER}.tar.gz --tries=3 https://mirrors.aliyun.com/mariadb/mariadb-${MY_VER}/source/mariadb-${MY_VER}.tar.gz + # fi - if [ "$?" != "0" ];then + if [ ! -f ${mariadbDir}/mariadb-${MY_VER}.tar.gz ];then wget --no-check-certificate -O ${mariadbDir}/mariadb-${MY_VER}.tar.gz --tries=3 https://archive.mariadb.org/mariadb-${MY_VER}/source/mariadb-${MY_VER}.tar.gz fi @@ -94,12 +94,14 @@ Install_app() echo '10.8' > $serverPath/mariadb/version.pl echo '安装完成' > $install_tmp else - # rm -rf ${mariadbDir}/mariadb-${MY_VER} echo '安装失败' > $install_tmp echo 'install fail'>&2 exit 1 fi fi + + rm -rf ${mariadbDir}/mariadb-${MY_VER} + rm -rf ${mariadbDir}/mariadb-${MY_VER}.tar.gz } Uninstall_app() diff --git a/plugins/mariadb/versions/10.9/install.sh b/plugins/mariadb/versions/10.9/install.sh index 51ab1a82f..835e8569a 100755 --- a/plugins/mariadb/versions/10.9/install.sh +++ b/plugins/mariadb/versions/10.9/install.sh @@ -22,8 +22,8 @@ Install_app() 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 `" + 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 @@ -59,12 +59,12 @@ Install_app() fi # ----- cpu end ------ - if [ ! -f ${mariadbDir}/mariadb-${MY_VER}.tar.gz ];then - wget --no-check-certificate -O ${mariadbDir}/mariadb-${MY_VER}.tar.gz --tries=3 https://mirrors.aliyun.com/mariadb/mariadb-${MY_VER}/source/mariadb-${MY_VER}.tar.gz - fi + # if [ ! -f ${mariadbDir}/mariadb-${MY_VER}.tar.gz ];then + # wget --no-check-certificate -O ${mariadbDir}/mariadb-${MY_VER}.tar.gz --tries=3 https://mirrors.aliyun.com/mariadb/mariadb-${MY_VER}/source/mariadb-${MY_VER}.tar.gz + # fi # https://downloads.mariadb.org/interstitial/mariadb-10.9.1/source/mariadb-10.9.1.tar.gz - if [ "$?" != "0" ];then + if [ ! -f ${mariadbDir}/mariadb-${MY_VER}.tar.gz ];then wget --no-check-certificate -O ${mariadbDir}/mariadb-${MY_VER}.tar.gz --tries=3 https://archive.mariadb.org/mariadb-${MY_VER}/source/mariadb-${MY_VER}.tar.gz fi @@ -95,12 +95,14 @@ Install_app() echo '10.8' > $serverPath/mariadb/version.pl echo '安装完成' > $install_tmp else - # rm -rf ${mariadbDir}/mariadb-${MY_VER} echo '安装失败' > $install_tmp echo 'install fail'>&2 exit 1 fi fi + + rm -rf ${mariadbDir}/mariadb-${MY_VER} + rm -rf ${mariadbDir}/mariadb-${MY_VER}.tar.gz } Uninstall_app()