diff --git a/plugins/mysql-community/versions/5.7/install_generic.sh b/plugins/mysql-community/versions/5.7/install_generic.sh index cd2f003db..1dc79f8c1 100755 --- a/plugins/mysql-community/versions/5.7/install_generic.sh +++ b/plugins/mysql-community/versions/5.7/install_generic.sh @@ -13,7 +13,7 @@ rootPath=$(dirname "$rootPath") serverPath=$(dirname "$rootPath") sysName=`uname` -myDir=${serverPath}/source/mysql-apt +myDir=${serverPath}/source/mysql-community OS_ARCH=`arch` MYSQL_VER=5.7.44 @@ -26,14 +26,14 @@ else exit 0 fi -# cd /www/server/mdserver-web/plugins/mysql-apt && bash install.sh install 5.7 -# cd /www/server/mdserver-web && python3 /www/server/mdserver-web/plugins/mysql-apt/index.py start 5.7 -APT_INSTALL() +# cd /www/server/mdserver-web/plugins/mysql-community && bash install.sh install 5.7 +# cd /www/server/mdserver-web && python3 /www/server/mdserver-web/plugins/mysql-community/index.py start 5.7 +COMMUNITY_INSTALL() { ######## mkdir -p $myDir -mkdir -p $serverPath/mysql-apt +mkdir -p $serverPath/mysql-community # Linux - Generic if [ ! -f ${myDir}/mysql-${SUFFIX_NAME}.tar.gz ];then @@ -50,7 +50,7 @@ rm -rf $myDir/mysql-${SUFFIX_NAME} ####### } -APT_UNINSTALL() +COMMUNITY_UNINSTALL() { ### rm -rf $myDir/mysql-${SUFFIX_NAME} @@ -61,31 +61,21 @@ rm -rf $myDir/mysql-${SUFFIX_NAME} Install_mysql() { echo '正在安装脚本文件...' - - isApt=`which apt` - if [ "$isApt" != "" ];then - APT_INSTALL - fi - + COMMUNITY_INSTALL if [ "$?" == "0" ];then - mkdir -p $serverPath/mysql-apt - echo '5.7' > $serverPath/mysql-apt/version.pl + mkdir -p $serverPath/mysql-community + echo '5.7' > $serverPath/mysql-community/version.pl echo '安装完成' else - echo '5.7' > $serverPath/mysql-apt/version.pl + echo '5.7' > $serverPath/mysql-community/version.pl echo "暂时不支持该系统" fi } Uninstall_mysql() { - - isApt=`which apt` - if [ "$isApt" != "" ];then - APT_UNINSTALL - fi - - rm -rf $serverPath/mysql-apt + COMMUNITY_UNINSTALL + rm -rf $serverPath/mysql-community echo '卸载完成' } diff --git a/plugins/mysql-community/versions/8.0/install_generic.sh b/plugins/mysql-community/versions/8.0/install_generic.sh index 5a080cd69..f0debfa91 100755 --- a/plugins/mysql-community/versions/8.0/install_generic.sh +++ b/plugins/mysql-community/versions/8.0/install_generic.sh @@ -13,20 +13,20 @@ rootPath=$(dirname "$rootPath") serverPath=$(dirname "$rootPath") sysName=`uname` -myDir=${serverPath}/source/mysql-apt +myDir=${serverPath}/source/mysql-community OS_ARCH=`arch` MYSQL_VER=8.0.39 SUFFIX_NAME=${MYSQL_VER}-linux-glibc2.28-${OS_ARCH} -# cd /www/server/mdserver-web/plugins/mysql-apt && bash install.sh install 8.0 -# cd /www/server/mdserver-web && python3 /www/server/mdserver-web/plugins/mysql-apt/index.py start 8.0 -APT_INSTALL() +# cd /www/server/mdserver-web/plugins/mysql-community && bash install.sh install 8.0 +# cd /www/server/mdserver-web && python3 /www/server/mdserver-web/plugins/mysql-community/index.py start 8.0 +COMMUNITY_INSTALL() { ######## mkdir -p $myDir -mkdir -p $serverPath/mysql-apt +mkdir -p $serverPath/mysql-community # Linux - Generic if [ ! -f ${myDir}/mysql-${SUFFIX_NAME}.tar.xz ];then @@ -35,7 +35,7 @@ fi if [ -d ${myDir} ];then cd ${myDir} && tar -Jxf ${myDir}/mysql-${SUFFIX_NAME}.tar.xz - cp -rf ${myDir}/mysql-${SUFFIX_NAME}/* $serverPath/mysql-apt + cp -rf ${myDir}/mysql-${SUFFIX_NAME}/* $serverPath/mysql-community fi # 测试时可关闭 @@ -43,7 +43,7 @@ rm -rf $myDir/mysql-${SUFFIX_NAME} ####### } -APT_UNINSTALL() +COMMUNITY_UNINSTALL() { ### rm -rf $myDir/mysql-${SUFFIX_NAME} @@ -55,30 +55,23 @@ Install_mysql() { echo '正在安装脚本文件...' - isApt=`which apt` - if [ "$isApt" != "" ];then - APT_INSTALL - fi + COMMUNITY_INSTALL if [ "$?" == "0" ];then - mkdir -p $serverPath/mysql-apt - echo '8.0' > $serverPath/mysql-apt/version.pl + mkdir -p $serverPath/mysql-community + echo '8.0' > $serverPath/mysql-community/version.pl echo '安装完成' else - echo '8.0' > $serverPath/mysql-apt/version.pl + echo '8.0' > $serverPath/mysql-community/version.pl echo "暂时不支持该系统" fi } Uninstall_mysql() { + COMMUNITY_UNINSTALL - isApt=`which apt` - if [ "$isApt" != "" ];then - APT_UNINSTALL - fi - - rm -rf $serverPath/mysql-apt + rm -rf $serverPath/mysql-community echo '卸载完成' } diff --git a/plugins/mysql-community/versions/8.2/install_generic.sh b/plugins/mysql-community/versions/8.2/install_generic.sh index 769c58398..d2cb381d3 100755 --- a/plugins/mysql-community/versions/8.2/install_generic.sh +++ b/plugins/mysql-community/versions/8.2/install_generic.sh @@ -13,20 +13,20 @@ rootPath=$(dirname "$rootPath") serverPath=$(dirname "$rootPath") sysName=`uname` -myDir=${serverPath}/source/mysql-apt +myDir=${serverPath}/source/mysql-community OS_ARCH=`arch` MYSQL_VER=8.2.0 SUFFIX_NAME=${MYSQL_VER}-linux-glibc2.28-${OS_ARCH} -# cd /www/server/mdserver-web/plugins/mysql-apt && bash install.sh install 8.2 -# cd /www/server/mdserver-web && python3 /www/server/mdserver-web/plugins/mysql-apt/index.py start 8.2 -APT_INSTALL() +# cd /www/server/mdserver-web/plugins/mysql-community && bash install.sh install 8.2 +# cd /www/server/mdserver-web && python3 /www/server/mdserver-web/plugins/mysql-community/index.py start 8.2 +COMMUNITY_INSTALL() { ######## mkdir -p $myDir -mkdir -p $serverPath/mysql-apt +mkdir -p $serverPath/mysql-community # Linux - Generic if [ ! -f ${myDir}/mysql-${SUFFIX_NAME}.tar.xz ];then @@ -35,7 +35,7 @@ fi if [ -d ${myDir} ];then cd ${myDir} && tar -Jxf ${myDir}/mysql-${SUFFIX_NAME}.tar.xz - cp -rf ${myDir}/mysql-${SUFFIX_NAME}/* $serverPath/mysql-apt + cp -rf ${myDir}/mysql-${SUFFIX_NAME}/* $serverPath/mysql-community fi # 测试时可关闭 @@ -43,7 +43,7 @@ rm -rf $myDir/mysql-${SUFFIX_NAME} ####### } -APT_UNINSTALL() +COMMUNITY_UNINSTALL() { ### rm -rf $myDir/mysql-${SUFFIX_NAME} @@ -54,31 +54,22 @@ rm -rf $myDir/mysql-${SUFFIX_NAME} Install_mysql() { echo '正在安装脚本文件...' - - isApt=`which apt` - if [ "$isApt" != "" ];then - APT_INSTALL - fi + COMMUNITY_INSTALL if [ "$?" == "0" ];then - mkdir -p $serverPath/mysql-apt - echo '8.2' > $serverPath/mysql-apt/version.pl + mkdir -p $serverPath/mysql-community + echo '8.2' > $serverPath/mysql-community/version.pl echo '安装完成' else - echo '8.2' > $serverPath/mysql-apt/version.pl + echo '8.2' > $serverPath/mysql-community/version.pl echo "暂时不支持该系统" fi } Uninstall_mysql() { - - isApt=`which apt` - if [ "$isApt" != "" ];then - APT_UNINSTALL - fi - - rm -rf $serverPath/mysql-apt + COMMUNITY_UNINSTALL + rm -rf $serverPath/mysql-community echo '卸载完成' } diff --git a/plugins/mysql-community/versions/8.3/install_generic.sh b/plugins/mysql-community/versions/8.3/install_generic.sh index c451fbd36..67debcca4 100755 --- a/plugins/mysql-community/versions/8.3/install_generic.sh +++ b/plugins/mysql-community/versions/8.3/install_generic.sh @@ -13,20 +13,20 @@ rootPath=$(dirname "$rootPath") serverPath=$(dirname "$rootPath") sysName=`uname` -myDir=${serverPath}/source/mysql-apt +myDir=${serverPath}/source/mysql-community OS_ARCH=`arch` MYSQL_VER=8.3.0 SUFFIX_NAME=${MYSQL_VER}-linux-glibc2.28-${OS_ARCH} -# cd /www/server/mdserver-web/plugins/mysql-apt && bash install.sh install 8.3 -# cd /www/server/mdserver-web && python3 /www/server/mdserver-web/plugins/mysql-apt/index.py start 8.3 -APT_INSTALL() +# cd /www/server/mdserver-web/plugins/mysql-community && bash install.sh install 8.3 +# cd /www/server/mdserver-web && python3 /www/server/mdserver-web/plugins/mysql-community/index.py start 8.3 +COMMUNITY_INSTALL() { ######## mkdir -p $myDir -mkdir -p $serverPath/mysql-apt +mkdir -p $serverPath/mysql-community # Linux - Generic if [ ! -f ${myDir}/mysql-${SUFFIX_NAME}.tar.xz ];then @@ -35,7 +35,7 @@ fi if [ -d ${myDir} ];then cd ${myDir} && tar -Jxf ${myDir}/mysql-${SUFFIX_NAME}.tar.xz - cp -rf ${myDir}/mysql-${SUFFIX_NAME}/* $serverPath/mysql-apt + cp -rf ${myDir}/mysql-${SUFFIX_NAME}/* $serverPath/mysql-community fi # 测试时可关闭 @@ -43,7 +43,7 @@ rm -rf $myDir/mysql-${SUFFIX_NAME} ####### } -APT_UNINSTALL() +COMMUNITY_UNINSTALL() { ### rm -rf $myDir/mysql-${SUFFIX_NAME} @@ -54,18 +54,13 @@ rm -rf $myDir/mysql-${SUFFIX_NAME} Install_mysql() { echo '正在安装脚本文件...' - - isApt=`which apt` - if [ "$isApt" != "" ];then - APT_INSTALL - fi - + COMMUNITY_INSTALL if [ "$?" == "0" ];then - mkdir -p $serverPath/mysql-apt - echo '8.3' > $serverPath/mysql-apt/version.pl + mkdir -p $serverPath/mysql-community + echo '8.3' > $serverPath/mysql-community/version.pl echo '安装完成' else - echo '8.3' > $serverPath/mysql-apt/version.pl + echo '8.3' > $serverPath/mysql-community/version.pl echo "暂时不支持该系统" fi } @@ -73,12 +68,8 @@ Install_mysql() Uninstall_mysql() { - isApt=`which apt` - if [ "$isApt" != "" ];then - APT_UNINSTALL - fi - - rm -rf $serverPath/mysql-apt + COMMUNITY_UNINSTALL + rm -rf $serverPath/mysql-APT_INSTALL echo '卸载完成' } diff --git a/plugins/mysql-community/versions/8.4/install_generic.sh b/plugins/mysql-community/versions/8.4/install_generic.sh index 5932cb0fa..261e19a58 100755 --- a/plugins/mysql-community/versions/8.4/install_generic.sh +++ b/plugins/mysql-community/versions/8.4/install_generic.sh @@ -13,22 +13,19 @@ rootPath=$(dirname "$rootPath") serverPath=$(dirname "$rootPath") sysName=`uname` -myDir=${serverPath}/source/mysql-apt +myDir=${serverPath}/source/mysql-community OS_ARCH=`arch` MYSQL_VER=8.4.2 SUFFIX_NAME=${MYSQL_VER}-linux-glibc2.28-${OS_ARCH} -# cd /www/server/mdserver-web/plugins/mysql-apt && bash install.sh install 8.4 -# cd /www/server/mdserver-web && python3 /www/server/mdserver-web/plugins/mysql-apt/index.py start 8.4 -APT_INSTALL() +# cd /www/server/mdserver-web/plugins/mysql-community && bash install.sh install 8.4 +# cd /www/server/mdserver-web && python3 /www/server/mdserver-web/plugins/mysql-community/index.py start 8.4 +COMMUNITY_INSTALL() { - - - ######## mkdir -p $myDir -mkdir -p $serverPath/mysql-apt +mkdir -p $serverPath/mysql-community # Linux - Generic # https://cdn.mysql.com/archives/mysql-8.4/mysql-8.4.2-linux-glibc2.28-x86_64.tar.xz @@ -38,7 +35,7 @@ fi if [ -d ${myDir} ];then cd ${myDir} && tar -Jxf ${myDir}/mysql-${SUFFIX_NAME}.tar.xz - cp -rf ${myDir}/mysql-${SUFFIX_NAME}/* $serverPath/mysql-apt + cp -rf ${myDir}/mysql-${SUFFIX_NAME}/* $serverPath/mysql-community fi # 测试时可关闭 @@ -46,7 +43,7 @@ rm -rf $myDir/mysql-${SUFFIX_NAME} ####### } -APT_UNINSTALL() +COMMUNITY_UNINSTALL() { ### rm -rf $myDir/mysql-${SUFFIX_NAME} @@ -57,31 +54,21 @@ rm -rf $myDir/mysql-${SUFFIX_NAME} Install_mysql() { echo '正在安装脚本文件...' - - isApt=`which apt` - if [ "$isApt" != "" ];then - APT_INSTALL - fi - + COMMUNITY_INSTALL if [ "$?" == "0" ];then - mkdir -p $serverPath/mysql-apt - echo '8.4' > $serverPath/mysql-apt/version.pl + mkdir -p $serverPath/mysql-community + echo '8.4' > $serverPath/mysql-community/version.pl echo '安装完成' else - echo '8.4' > $serverPath/mysql-apt/version.pl + echo '8.4' > $serverPath/mysql-community/version.pl echo "暂时不支持该系统" fi } Uninstall_mysql() { - - isApt=`which apt` - if [ "$isApt" != "" ];then - APT_UNINSTALL - fi - - rm -rf $serverPath/mysql-apt + COMMUNITY_UNINSTALL + rm -rf $serverPath/mysql-community echo '卸载完成' } diff --git a/plugins/mysql-community/versions/9.0/install_generic.sh b/plugins/mysql-community/versions/9.0/install_generic.sh index 2a8cf5868..cdf5c915e 100755 --- a/plugins/mysql-community/versions/9.0/install_generic.sh +++ b/plugins/mysql-community/versions/9.0/install_generic.sh @@ -12,20 +12,20 @@ rootPath=$(dirname "$rootPath") serverPath=$(dirname "$rootPath") sysName=`uname` -myDir=${serverPath}/source/mysql-apt +myDir=${serverPath}/source/mysql-community OS_ARCH=`arch` MYSQL_VER=9.0.1 SUFFIX_NAME=${MYSQL_VER}-linux-glibc2.28-${OS_ARCH} -# cd /www/server/mdserver-web/plugins/mysql-apt && bash install.sh install 9.0 -# cd /www/server/mdserver-web && python3 /www/server/mdserver-web/plugins/mysql-apt/index.py start 9.0 -APT_INSTALL() +# cd /www/server/mdserver-web/plugins/mysql-community && bash install.sh install 9.0 +# cd /www/server/mdserver-web && python3 /www/server/mdserver-web/plugins/mysql-community/index.py start 9.0 +COMMUNITY_INSTALL() { ######## mkdir -p $myDir -mkdir -p $serverPath/mysql-apt +mkdir -p $serverPath/mysql-community # Linux - Generic # https://cdn.mysql.com/archives/mysql-9.0/mysql-9.0.1-linux-glibc2.28-x86_64.tar.xz @@ -35,7 +35,7 @@ fi if [ -d ${myDir} ];then cd ${myDir} && tar -Jxf ${myDir}/mysql-${SUFFIX_NAME}.tar.xz - cp -rf ${myDir}/mysql-${SUFFIX_NAME}/* $serverPath/mysql-apt + cp -rf ${myDir}/mysql-${SUFFIX_NAME}/* $serverPath/mysql-community fi # 测试时可关闭 @@ -43,7 +43,7 @@ rm -rf $myDir/mysql-${SUFFIX_NAME} ####### } -APT_UNINSTALL() +COMMUNITY_UNINSTALL() { ### rm -rf $myDir/mysql-${SUFFIX_NAME} @@ -54,31 +54,21 @@ rm -rf $myDir/mysql-${SUFFIX_NAME} Install_mysql() { echo '正在安装脚本文件...' - - isApt=`which apt` - if [ "$isApt" != "" ];then - APT_INSTALL - fi - + COMMUNITY_INSTALL if [ "$?" == "0" ];then - mkdir -p $serverPath/mysql-apt - echo '9.0' > $serverPath/mysql-apt/version.pl + mkdir -p $serverPath/mysql-community + echo '9.0' > $serverPath/mysql-community/version.pl echo '安装完成' else - echo '9.0' > $serverPath/mysql-apt/version.pl + echo '9.0' > $serverPath/mysql-community/version.pl echo "暂时不支持该系统" fi } Uninstall_mysql() { - - isApt=`which apt` - if [ "$isApt" != "" ];then - APT_UNINSTALL - fi - - rm -rf $serverPath/mysql-apt + COMMUNITY_UNINSTALL + rm -rf $serverPath/mysql-community echo '卸载完成' } diff --git a/plugins/mysql-community/versions/9.1/install_generic.sh b/plugins/mysql-community/versions/9.1/install_generic.sh index 0c0ea4bb5..382e39040 100755 --- a/plugins/mysql-community/versions/9.1/install_generic.sh +++ b/plugins/mysql-community/versions/9.1/install_generic.sh @@ -13,20 +13,20 @@ rootPath=$(dirname "$rootPath") serverPath=$(dirname "$rootPath") sysName=`uname` -myDir=${serverPath}/source/mysql-apt +myDir=${serverPath}/source/mysql-community OS_ARCH=`arch` MYSQL_VER=9.1.0 SUFFIX_NAME=${MYSQL_VER}-linux-glibc2.28-${OS_ARCH} -# cd /www/server/mdserver-web/plugins/mysql-apt && bash install.sh install 9.1 -# cd /www/server/mdserver-web && python3 /www/server/mdserver-web/plugins/mysql-apt/index.py start 9.1 -APT_INSTALL() +# cd /www/server/mdserver-web/plugins/mysql-community && bash install.sh install 9.1 +# cd /www/server/mdserver-web && python3 /www/server/mdserver-web/plugins/mysql-community/index.py start 9.1 +COMMUNITY_INSTALL() { ######## mkdir -p $myDir -mkdir -p $serverPath/mysql-apt +mkdir -p $serverPath/mysql-community # Linux - Generic # https://cdn.mysql.com/archives/mysql-8.4/mysql-8.4.2-linux-glibc2.28-x86_64.tar.xz @@ -37,7 +37,7 @@ fi if [ -d ${myDir} ];then cd ${myDir} && tar -Jxf ${myDir}/mysql-${SUFFIX_NAME}.tar.xz - cp -rf ${myDir}/mysql-${SUFFIX_NAME}/* $serverPath/mysql-apt + cp -rf ${myDir}/mysql-${SUFFIX_NAME}/* $serverPath/mysql-community fi # 测试时可关闭 @@ -45,7 +45,7 @@ rm -rf $myDir/mysql-${SUFFIX_NAME} ####### } -APT_UNINSTALL() +COMMUNITY_UNINSTALL() { ### rm -rf $myDir/mysql-${SUFFIX_NAME} @@ -57,31 +57,21 @@ rm -rf $myDir/mysql-${SUFFIX_NAME} Install_mysql() { echo '正在安装脚本文件...' - - isApt=`which apt` - if [ "$isApt" != "" ];then - APT_INSTALL - fi - + COMMUNITY_INSTALL if [ "$?" == "0" ];then - mkdir -p $serverPath/mysql-apt - echo '9.1' > $serverPath/mysql-apt/version.pl + mkdir -p $serverPath/mysql-community + echo '9.1' > $serverPath/mysql-community/version.pl echo '安装完成' else - echo '9.1' > $serverPath/mysql-apt/version.pl + echo '9.1' > $serverPath/mysql-community/version.pl echo "暂时不支持该系统" fi } Uninstall_mysql() { - - isApt=`which apt` - if [ "$isApt" != "" ];then - APT_UNINSTALL - fi - - rm -rf $serverPath/mysql-apt + COMMUNITY_UNINSTALL + rm -rf $serverPath/mysql-community echo '卸载完成' }