From 03638b9ec7b131542fd3430ea1794e9e585ce4a9 Mon Sep 17 00:00:00 2001
From: Bram Prieshof <bram@bprieshof.nl>
Date: Fri, 3 Sep 2021 12:18:10 +0200
Subject: [PATCH] Added Debian 11 support

---
 MySQL-ModInst.sh |  6 +++++-
 conf.sh          |  2 +-
 mysql-8.0.sh     | 11 ++++++++---
 preconf.sh       |  2 +-
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/MySQL-ModInst.sh b/MySQL-ModInst.sh
index fc88ced..8b61f13 100644
--- a/MySQL-ModInst.sh
+++ b/MySQL-ModInst.sh
@@ -9,7 +9,6 @@
 
 #MySQL module specific Var
 PHPMyadmin=1
-phpmyadminver="5.0.2" 
 
 #SMI specific Vars
 SMI_config=no
@@ -42,6 +41,11 @@ elif [[ "${dist}" == *"debian"* ]] && [[ "${dist_ver}" == *"10"* ]]; then
  PKGI="${PKGM} install -y --no-install-recommends"
  PKGLIST="apt.pkg.list"
  shortdist=deb10
+elif [[ "${dist}" == *"debian"* ]] && [[ "${dist_ver}" == *"11"* ]]; then
+ PKGM="$APTMODE"
+ PKGI="${PKGM} install -y --no-install-recommends"
+ PKGLIST="apt.pkg.list"
+ shortdist=deb11
 elif [[ "${dist}" == *"centos"* ]] && [[ "${dist_ver}" == *"8"* ]]; then
  PKGM="dnf"
  PKGI="${PKGM} install --setopt=install_weak_deps=False --best -y"
diff --git a/conf.sh b/conf.sh
index 91fa3e8..87e1b6e 100644
--- a/conf.sh
+++ b/conf.sh
@@ -9,7 +9,7 @@ rm -rf /etc/mysql/ /etc/my.cnf.d/ /etc/my.cnf
 mkdir /etc/mysql/
 touch /etc/mysql/my.cnf.fallback
 curl --retry 7 --retry-delay 5 -s "$mrepo"/raw/branch/"$mbranch"/config/MySQL/mysqld-V8.cnf -o /etc/mysql/my.cnf
-if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist" = "deb10" ] ; then
+if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist" = "deb10" ] || [ "$shortdist" = "deb11" ] ; then
    MYSQLSNAME=mysql
    systemctl stop $MYSQLSNAME
     sed -i 's#MySQLlog#/var/log/mysql/error.log#g' /etc/mysql/my.cnf
diff --git a/mysql-8.0.sh b/mysql-8.0.sh
index ed681f2..55b77a9 100644
--- a/mysql-8.0.sh
+++ b/mysql-8.0.sh
@@ -1,6 +1,11 @@
-###########################
-#   MySQL 8.0 Installer   #
-###########################
+#####################################
+#        MySQL 8.0 Installer        #
+#                                   #
+#            DO NOT USE!            #
+#                                   #
+#  Deprecated, for legacy use only  #
+#  replaced by `Mysql-ModInst.sh`   #  
+#####################################
 
 
 ##-----------------##
diff --git a/preconf.sh b/preconf.sh
index b61e6c7..5fef8b2 100644
--- a/preconf.sh
+++ b/preconf.sh
@@ -2,7 +2,7 @@ mrepo=https://git.ictmaatwerk.com/VPS-scripts/MySQL
 mbranch=master
 if [ -z ${password+x} ]; then echo 'Error $password is not set'; fi
 
-if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist" = "deb10" ] ; then
+if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist" = "deb10" ] || [ "$shortdist" = "deb11" ] ; then
     if [ -z ${DEBIAN_FRONTEND+x} ]; then echo 'dpkg env not set' > $OUTPUT 2>&1 ; else CurDebFrond="$DEBIAN_FRONTEND"; fi #checking and saving DEBIAN_FRONTEND
     export DEBIAN_FRONTEND=noninteractive