From b01023bef51037cc85da0daf0e23c675003c67c5 Mon Sep 17 00:00:00 2001
From: CanbiZ <47820557+MickLesk@users.noreply.github.com>
Date: Mon, 2 Jun 2025 10:52:54 +0200
Subject: [PATCH] Update tools.func

---
 misc/tools.func | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/misc/tools.func b/misc/tools.func
index be5e9288..cd5f95cd 100644
--- a/misc/tools.func
+++ b/misc/tools.func
@@ -312,12 +312,12 @@ install_mysql() {
   if [[ "$NEED_INSTALL" == true ]]; then
     msg_info "Removing conflicting MySQL packages"
     $STD systemctl stop mysql >/dev/null 2>&1 || true
-    $STD apt-get purge -y 'mysql*'
+    $STD apt-get purge -y "^mysql-server.*" "^mysql-client.*" "^mysql-common" || true
     rm -f /etc/apt/sources.list.d/mysql.list /etc/apt/trusted.gpg.d/mysql.gpg
 
     msg_info "Setting up MySQL APT Repository"
     DISTRO_CODENAME="$(awk -F= '/VERSION_CODENAME/ { print $2 }' /etc/os-release)"
-    curl -fsSL https://repo.mysql.com/RPM-GPG-KEY-mysql-2022 | gpg --dearmor -o /etc/apt/trusted.gpg.d/mysql.gpg
+    curl -fsSL https://repo.mysql.com/RPM-GPG-KEY-mysql-2023 | gpg --dearmor -o /etc/apt/trusted.gpg.d/mysql.gpg
     echo "deb [signed-by=/etc/apt/trusted.gpg.d/mysql.gpg] https://repo.mysql.com/apt/debian/ ${DISTRO_CODENAME} mysql-${MYSQL_VERSION}" \
       >/etc/apt/sources.list.d/mysql.list