From d32ccbce0c5c4393ab321723eddc37609531e761 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 20 Jul 2024 13:01:23 +0800
Subject: [PATCH] update_dev

---
 plugins/mysql-yum/versions/5.7/install.sh | 38 ++++++++++++++++++++-
 plugins/mysql-yum/versions/8.0/install.sh |  1 +
 plugins/mysql-yum/versions/8.2/install.sh | 40 ++++++++++++++++++++--
 plugins/mysql-yum/versions/8.3/install.sh | 40 ++++++++++++++++++++--
 plugins/mysql-yum/versions/8.4/install.sh | 41 +++++++++++++++++++++--
 scripts/install/opensuse.sh               |  1 +
 6 files changed, 153 insertions(+), 8 deletions(-)

diff --git a/plugins/mysql-yum/versions/5.7/install.sh b/plugins/mysql-yum/versions/5.7/install.sh
index 9658d83cf..17e5203b9 100755
--- a/plugins/mysql-yum/versions/5.7/install.sh
+++ b/plugins/mysql-yum/versions/5.7/install.sh
@@ -40,7 +40,7 @@ if [ "$OSNAME" == "centos" ];then
 elif [ "$OSNAME" == "fedora" ]; then
 	OS_SIGN=10.fc${VERSION_ID}
 elif [ "$OSNAME" == "opensuse" ]; then
-	OS_SIGN=1.sl${VERSION_ID}
+	OS_SIGN=1.sl${VERSION_ID:0:2}
 fi
 
 MYSQL_VER=5.7.44
@@ -74,6 +74,37 @@ rpm2cpio ${myDir}/mysql-community-test-${SUFFIX_NAME}.rpm | cpio -div
 #######
 }
 
+ZYPPER_INSTALL()
+{
+zypper install -y libstdc++6
+
+mkdir -p /var/run/mysqld
+chown mysql -R /var/run/mysqld
+#######
+mkdir -p $myDir
+
+wget --no-check-certificate -O $myDir/mysql-${SUFFIX_NAME}.rpm-bundle.tar https://cdn.mysql.com/archives/mysql-8.0/mysql-${SUFFIX_NAME}.rpm-bundle.tar
+echo "wget --no-check-certificate -O $myDir/mysql-${SUFFIX_NAME}.rpm-bundle.tar https://cdn.mysql.com/archives/mysql-8.0/mysql-${SUFFIX_NAME}.rpm-bundle.tar"
+cd ${myDir} && tar vxf mysql-${SUFFIX_NAME}.rpm-bundle.tar
+
+mkdir -p ${serverPath}/mysql-yum/bin && cd ${serverPath}/mysql-yum/bin
+
+rpm2cpio ${myDir}/mysql-community-client-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-client-${SUFFIX_NAME}.x86_64.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-common-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-debuginfo-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-devel-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-embedded-compat-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-icu-data-files-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-libs-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-libs-compat-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-server-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-server-debug-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-test-${SUFFIX_NAME}.rpm | cpio -div
+
+#######
+}
+
 YUM_UNINSTALL()
 {
 ### YUM卸载 START ########
@@ -94,6 +125,11 @@ Install_mysql()
 	if [ "$isYum" != "" ];then
 		YUM_INSTALL
 	fi
+
+	isZypper=`which zypper`
+	if [ "$isZypper" != "" ];then
+		ZYPPER_INSTALL
+	fi
 	
 	rm -rf $myDir
 	echo '5.7' > $serverPath/mysql-yum/version.pl
diff --git a/plugins/mysql-yum/versions/8.0/install.sh b/plugins/mysql-yum/versions/8.0/install.sh
index cfd5d6063..04c211d1d 100755
--- a/plugins/mysql-yum/versions/8.0/install.sh
+++ b/plugins/mysql-yum/versions/8.0/install.sh
@@ -73,6 +73,7 @@ rpm2cpio ${myDir}/mysql-community-test-${SUFFIX_NAME}.rpm | cpio -div
 
 ZYPPER_INSTALL()
 {
+zypper install -y libstdc++6
 
 mkdir -p /var/run/mysqld
 chown mysql -R /var/run/mysqld
diff --git a/plugins/mysql-yum/versions/8.2/install.sh b/plugins/mysql-yum/versions/8.2/install.sh
index 45452cb80..d8477b191 100755
--- a/plugins/mysql-yum/versions/8.2/install.sh
+++ b/plugins/mysql-yum/versions/8.2/install.sh
@@ -35,8 +35,8 @@ if [ "$OSNAME" == "centos" ];then
 	OS_SIGN=1.el${VERSION_ID}
 elif [ "$OSNAME" == "fedora" ]; then
 	OS_SIGN=10.fc${VERSION_ID}
-elif [ "$OSNAME" == "suse" ]; then
-	OS_SIGN=1.sl${VERSION_ID}
+elif [ "$OSNAME" == "opensuse" ]; then
+	OS_SIGN=1.sl${VERSION_ID:0:2}
 fi
 
 MYSQL_VER=8.2.0
@@ -72,6 +72,37 @@ rpm2cpio ${myDir}/mysql-community-test-${SUFFIX_NAME}.rpm | cpio -div
 #######
 }
 
+ZYPPER_INSTALL()
+{
+zypper install -y libstdc++6
+
+mkdir -p /var/run/mysqld
+chown mysql -R /var/run/mysqld
+#######
+mkdir -p $myDir
+
+wget --no-check-certificate -O $myDir/mysql-${SUFFIX_NAME}.rpm-bundle.tar https://cdn.mysql.com/archives/mysql-8.0/mysql-${SUFFIX_NAME}.rpm-bundle.tar
+echo "wget --no-check-certificate -O $myDir/mysql-${SUFFIX_NAME}.rpm-bundle.tar https://cdn.mysql.com/archives/mysql-8.0/mysql-${SUFFIX_NAME}.rpm-bundle.tar"
+cd ${myDir} && tar vxf mysql-${SUFFIX_NAME}.rpm-bundle.tar
+
+mkdir -p ${serverPath}/mysql-yum/bin && cd ${serverPath}/mysql-yum/bin
+
+rpm2cpio ${myDir}/mysql-community-client-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-client-${SUFFIX_NAME}.x86_64.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-common-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-debuginfo-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-devel-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-embedded-compat-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-icu-data-files-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-libs-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-libs-compat-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-server-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-server-debug-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-test-${SUFFIX_NAME}.rpm | cpio -div
+
+#######
+}
+
 YUM_UNINSTALL()
 {
 ### YUM卸载 START ########
@@ -96,6 +127,11 @@ Install_mysql()
 		YUM_INSTALL
 	fi
 
+	isZypper=`which zypper`
+	if [ "$isZypper" != "" ];then
+		ZYPPER_INSTALL
+	fi
+
 	rm -rf $myDir	
 	
 	echo '8.2' > $serverPath/mysql-yum/version.pl
diff --git a/plugins/mysql-yum/versions/8.3/install.sh b/plugins/mysql-yum/versions/8.3/install.sh
index 663322c53..c3a676aab 100755
--- a/plugins/mysql-yum/versions/8.3/install.sh
+++ b/plugins/mysql-yum/versions/8.3/install.sh
@@ -35,8 +35,8 @@ if [ "$OSNAME" == "centos" ];then
 	OS_SIGN=1.el${VERSION_ID}
 elif [ "$OSNAME" == "fedora" ]; then
 	OS_SIGN=10.fc${VERSION_ID}
-elif [ "$OSNAME" == "suse" ]; then
-	OS_SIGN=1.sl${VERSION_ID}
+elif [ "$OSNAME" == "opensuse" ]; then
+	OS_SIGN=1.sl${VERSION_ID:0:2}
 fi
 
 MYSQL_VER=8.3.0
@@ -72,6 +72,37 @@ rpm2cpio ${myDir}/mysql-community-test-${SUFFIX_NAME}.rpm | cpio -div
 #######
 }
 
+ZYPPER_INSTALL()
+{
+zypper install -y libstdc++6
+
+mkdir -p /var/run/mysqld
+chown mysql -R /var/run/mysqld
+#######
+mkdir -p $myDir
+
+wget --no-check-certificate -O $myDir/mysql-${SUFFIX_NAME}.rpm-bundle.tar https://cdn.mysql.com/archives/mysql-8.0/mysql-${SUFFIX_NAME}.rpm-bundle.tar
+echo "wget --no-check-certificate -O $myDir/mysql-${SUFFIX_NAME}.rpm-bundle.tar https://cdn.mysql.com/archives/mysql-8.0/mysql-${SUFFIX_NAME}.rpm-bundle.tar"
+cd ${myDir} && tar vxf mysql-${SUFFIX_NAME}.rpm-bundle.tar
+
+mkdir -p ${serverPath}/mysql-yum/bin && cd ${serverPath}/mysql-yum/bin
+
+rpm2cpio ${myDir}/mysql-community-client-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-client-${SUFFIX_NAME}.x86_64.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-common-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-debuginfo-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-devel-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-embedded-compat-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-icu-data-files-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-libs-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-libs-compat-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-server-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-server-debug-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-test-${SUFFIX_NAME}.rpm | cpio -div
+
+#######
+}
+
 YUM_UNINSTALL()
 {
 ### YUM卸载 START ########
@@ -96,6 +127,11 @@ Install_mysql()
 		YUM_INSTALL
 	fi
 
+	isZypper=`which zypper`
+	if [ "$isZypper" != "" ];then
+		ZYPPER_INSTALL
+	fi
+
 	rm -rf $myDir	
 	
 	echo '8.3' > $serverPath/mysql-yum/version.pl
diff --git a/plugins/mysql-yum/versions/8.4/install.sh b/plugins/mysql-yum/versions/8.4/install.sh
index a6e12b431..ad97de8e5 100755
--- a/plugins/mysql-yum/versions/8.4/install.sh
+++ b/plugins/mysql-yum/versions/8.4/install.sh
@@ -35,8 +35,8 @@ if [ "$OSNAME" == "centos" ];then
 	OS_SIGN=1.el${VERSION_ID}
 elif [ "$OSNAME" == "fedora" ]; then
 	OS_SIGN=10.fc${VERSION_ID}
-elif [ "$OSNAME" == "suse" ]; then
-	OS_SIGN=1.sl${VERSION_ID}
+elif [ "$OSNAME" == "opensuse" ]; then
+	OS_SIGN=1.sl${VERSION_ID:0:2}
 fi
 
 MYSQL_VER=8.4.0
@@ -52,7 +52,6 @@ chown mysql -R /var/run/mysqld
 mkdir -p $myDir
 
 # https://dev.mysql.com/get/Downloads/MySQL-8.4/mysql-${SUFFIX_NAME}.rpm-bundle.tar
-
 # https://cdn.mysql.com/archives/mysql-8.4/mysql-${SUFFIX_NAME}.rpm-bundle.tar
 
 wget --no-check-certificate -O $myDir/mysql-${SUFFIX_NAME}.rpm-bundle.tar https://dev.mysql.com/get/Downloads/MySQL-8.4/mysql-${SUFFIX_NAME}.rpm-bundle.tar
@@ -76,6 +75,37 @@ rpm2cpio ${myDir}/mysql-community-test-${SUFFIX_NAME}.rpm | cpio -div
 #######
 }
 
+ZYPPER_INSTALL()
+{
+zypper install -y libstdc++6
+
+mkdir -p /var/run/mysqld
+chown mysql -R /var/run/mysqld
+#######
+mkdir -p $myDir
+
+wget --no-check-certificate -O $myDir/mysql-${SUFFIX_NAME}.rpm-bundle.tar https://cdn.mysql.com/archives/mysql-8.0/mysql-${SUFFIX_NAME}.rpm-bundle.tar
+echo "wget --no-check-certificate -O $myDir/mysql-${SUFFIX_NAME}.rpm-bundle.tar https://cdn.mysql.com/archives/mysql-8.0/mysql-${SUFFIX_NAME}.rpm-bundle.tar"
+cd ${myDir} && tar vxf mysql-${SUFFIX_NAME}.rpm-bundle.tar
+
+mkdir -p ${serverPath}/mysql-yum/bin && cd ${serverPath}/mysql-yum/bin
+
+rpm2cpio ${myDir}/mysql-community-client-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-client-${SUFFIX_NAME}.x86_64.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-common-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-debuginfo-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-devel-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-embedded-compat-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-icu-data-files-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-libs-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-libs-compat-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-server-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-server-debug-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-test-${SUFFIX_NAME}.rpm | cpio -div
+
+#######
+}
+
 YUM_UNINSTALL()
 {
 ### YUM卸载 START ########
@@ -99,6 +129,11 @@ Install_mysql()
 		YUM_INSTALL
 	fi
 
+	isZypper=`which zypper`
+	if [ "$isZypper" != "" ];then
+		ZYPPER_INSTALL
+	fi
+
 	rm -rf $myDir	
 	
 	echo '8.4' > $serverPath/mysql-yum/version.pl
diff --git a/scripts/install/opensuse.sh b/scripts/install/opensuse.sh
index e7f1648b1..1b9cdb687 100644
--- a/scripts/install/opensuse.sh
+++ b/scripts/install/opensuse.sh
@@ -27,6 +27,7 @@ zypper install -y libjpeg-devel libpng-devel
 zypper install -y libevent-devel
 zypper install -y libtirpc-devel
 zypper install -y rpcgen
+zypper install -y libstdc++6
 zypper install -y expect
 zypper install -y pv
 zypper install -y bc