From 6aca735a920994dec1b3809d4a12a0721af335b5 Mon Sep 17 00:00:00 2001
From: CanbiZ <47820557+MickLesk@users.noreply.github.com>
Date: Wed, 18 Jun 2025 11:50:21 +0200
Subject: [PATCH] Update tools.func

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

diff --git a/misc/tools.func b/misc/tools.func
index 557fede1..fd9eff38 100644
--- a/misc/tools.func
+++ b/misc/tools.func
@@ -220,10 +220,11 @@ function setup_postgresql() {
 #   MARIADB_VERSION - MariaDB version to install (e.g. 10.11, latest) (default: latest)
 # ------------------------------------------------------------------------------
 
-function setup_mariadb() {
+setup_mariadb() {
   local MARIADB_VERSION="${MARIADB_VERSION:-latest}"
   local DISTRO_CODENAME
   DISTRO_CODENAME="$(awk -F= '/^VERSION_CODENAME=/{print $2}' /etc/os-release)"
+  CURRENT_OS="$(awk -F= '/^ID=/{print $2}' /etc/os-release)"
 
   msg_info "Setting up MariaDB $MARIADB_VERSION"
   # grab dynamic latest LTS version
@@ -244,7 +245,7 @@ function setup_mariadb() {
 
   local CURRENT_VERSION=""
   if command -v mariadb >/dev/null; then
-    CURRENT_VERSION="$(mariadb --version | grep -oP 'Ver\s+\K[0-9]+\.[0-9]+')"
+    CURRENT_VERSION=$(mariadb --version | grep -oE '[0-9]+\.[0-9]+\.[0-9]+')
   fi
 
   if [[ "$CURRENT_VERSION" == "$MARIADB_VERSION" ]]; then
@@ -268,7 +269,7 @@ function setup_mariadb() {
   curl -fsSL "https://mariadb.org/mariadb_release_signing_key.asc" |
     gpg --dearmor -o /etc/apt/trusted.gpg.d/mariadb.gpg
 
-  echo "deb [signed-by=/etc/apt/trusted.gpg.d/mariadb.gpg] http://mirror.mariadb.org/repo/${MARIADB_VERSION}/debian ${DISTRO_CODENAME} main" \
+  echo "deb [signed-by=/etc/apt/trusted.gpg.d/mariadb.gpg] http://mirror.mariadb.org/repo/${MARIADB_VERSION}/${CURRENT_OS} ${DISTRO_CODENAME} main" \
     >/etc/apt/sources.list.d/mariadb.list
 
   $STD apt-get update
@@ -293,6 +294,7 @@ function setup_mysql() {
   local MYSQL_VERSION="${MYSQL_VERSION:-8.0}"
   local CURRENT_VERSION=""
   local NEED_INSTALL=false
+  CURRENT_OS="$(awk -F= '/^ID=/{print $2}' /etc/os-release)"
 
   if command -v mysql >/dev/null; then
     CURRENT_VERSION="$(mysql --version | grep -oP 'Distrib\s+\K[0-9]+\.[0-9]+')"
@@ -322,7 +324,7 @@ function setup_mysql() {
     local DISTRO_CODENAME
     DISTRO_CODENAME="$(awk -F= '/VERSION_CODENAME/ { print $2 }' /etc/os-release)"
     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}" \
+    echo "deb [signed-by=/etc/apt/trusted.gpg.d/mysql.gpg] https://repo.mysql.com/apt/${CURRENT_OS}/ ${DISTRO_CODENAME} mysql-${MYSQL_VERSION}" \
       >/etc/apt/sources.list.d/mysql.list
 
     export DEBIAN_FRONTEND=noninteractive