From 3e5c005f2550a9abf91adb661833153e068bc0fb Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 17 Dec 2024 15:50:31 +0800
Subject: [PATCH] update_dev

---
 .../mysql-apt/versions/8.4/install_generic.sh | 30 ++++---------------
 scripts/install/debian.sh                     |  4 +++
 scripts/install/ubuntu.sh                     |  4 +++
 3 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/plugins/mysql-apt/versions/8.4/install_generic.sh b/plugins/mysql-apt/versions/8.4/install_generic.sh
index e2a2195fd..7812c1871 100755
--- a/plugins/mysql-apt/versions/8.4/install_generic.sh
+++ b/plugins/mysql-apt/versions/8.4/install_generic.sh
@@ -44,7 +44,7 @@ fi
 
 
 MYSQL_VER=8.4.2
-SUFFIX_NAME=${MYSQL_VER}-1${OSNAME}${VERSION_ID}_${ARCH}
+SUFFIX_NAME=${MYSQL_VER}-linux-glibc2.28_${TMP_ARCH}
 
 
 # /lib/systemd/system/mysql.service
@@ -60,33 +60,13 @@ mkdir -p /var/run/mysqld
 chown mysql -R /var/run/mysqld
 
 # Linux - Generic
-
 # https://cdn.mysql.com/archives/mysql-8.4/mysql-8.4.2-linux-glibc2.28-x86_64.tar.xz
+wget --no-check-certificate -O ${myDir}/mysql-${SUFFIX_NAME}.tar.xz https://cdn.mysql.com/archives/mysql-8.4/mysql-${SUFFIX_NAME}.tar.xz
 
-# SUFFIX_NAME=${MYSQL_VER}-linux-glibc2.28_${TMP_ARCH}
-# wget --no-check-certificate -O mysql-8.4.2-linux-glibc2.28-x86_64.tar.xz https://cdn.mysql.com/archives/mysql-8.4/mysql-${SUFFIX_NAME}.tar.xz
-
-wget --no-check-certificate -O ${myDir}/mysql-server_${SUFFIX_NAME}.deb-bundle.tar https://dev.mysql.com/get/Downloads/MySQL-8.4/mysql-server_${SUFFIX_NAME}.deb-bundle.tar
-chmod +x ${myDir}/mysql-server_${SUFFIX_NAME}.deb-bundle.tar
-cd ${myDir} && tar vxf ${myDir}/mysql-server_${SUFFIX_NAME}.deb-bundle.tar
-
-apt update -y
-apt install -y libnuma1 libaio1 libmecab2
-
-# 安装
-dpkg -X mysql-common_${SUFFIX_NAME}.deb $serverPath/mysql-apt/bin
-
+if [ -d ${myDir} ];then
+	cd ${myDir} && tar zvxf ${myDir}/mysql-${SUFFIX_NAME}.tar.xz
 
-
-dpkg -X mysql-community-client-plugins_${SUFFIX_NAME}.deb $serverPath/mysql-apt/bin
-dpkg -X mysql-community-client-core_${SUFFIX_NAME}.deb $serverPath/mysql-apt/bin
-dpkg -X mysql-community-client_${SUFFIX_NAME}.deb $serverPath/mysql-apt/bin
-dpkg -X mysql-client_${SUFFIX_NAME}.deb $serverPath/mysql-apt/bin
-
-dpkg -X mysql-community-server-core_${SUFFIX_NAME}.deb $serverPath/mysql-apt/bin
-
-dpkg -X mysql-community-server_${SUFFIX_NAME}.deb $serverPath/mysql-apt/bin
-dpkg -X mysql-server_${SUFFIX_NAME}.deb $serverPath/mysql-apt/bin
+fi
 
 # 测试时可关闭
 rm -rf $myDir
diff --git a/scripts/install/debian.sh b/scripts/install/debian.sh
index 5bf39008c..04e4ec561 100644
--- a/scripts/install/debian.sh
+++ b/scripts/install/debian.sh
@@ -82,6 +82,10 @@ apt install -y libncurses5
 apt install -y libncurses5-dev
 apt install -y bzip2
 
+apt install -y libnuma1 
+apt install -y libaio1 
+apt install -y libmecab2
+
 P_VER=`python3 -V | awk '{print $2}'`
 if version_ge "$P_VER" "3.11.0" ;then
     echo -e "\e[1;31mapt install python3.12-venv\e[0m"
diff --git a/scripts/install/ubuntu.sh b/scripts/install/ubuntu.sh
index 8dbccc416..caf980e62 100644
--- a/scripts/install/ubuntu.sh
+++ b/scripts/install/ubuntu.sh
@@ -39,6 +39,10 @@ apt install -y libncurses5-dev
 apt install -y software-properties-common
 apt install -y bzip2
 
+apt install -y libnuma1 
+apt install -y libaio1 
+apt install -y libmecab2
+
 P_VER=`python3 -V | awk '{print $2}'`
 if version_ge "$P_VER" "3.11.0" ;then
     echo -e "\e[1;31mapt install python3.12-venv\e[0m"