From f0f28da12e886c3a284d4e304a767c35dd5ffd74 Mon Sep 17 00:00:00 2001
From: myvesta <38690722+myvesta@users.noreply.github.com>
Date: Sun, 23 Jan 2022 23:46:17 +0100
Subject: [PATCH] phpmyadmin installer mysql8 suppodrt

---
 install/debian/10/pma/pma.sh | 10 ++++++++++
 install/debian/11/pma/pma.sh | 10 ++++++++++
 2 files changed, 20 insertions(+)

diff --git a/install/debian/10/pma/pma.sh b/install/debian/10/pma/pma.sh
index eb4be1108..f04f3f8e9 100644
--- a/install/debian/10/pma/pma.sh
+++ b/install/debian/10/pma/pma.sh
@@ -146,12 +146,22 @@ CREATE DATABASE $PMADB;
 MYSQL_PMA2
 
 #GRANT PMA USE SOME RIGHTS
+if [ ! -f "/etc/apt/sources.list.d/mysql.list" ]; then
+# MariaDB
 mysql -uroot <<MYSQL_PMA3
 USE $PMADB;
 GRANT USAGE ON $PMADB.* TO '$PMAUSER'@'localhost' IDENTIFIED BY '$PASS';
 GRANT ALL PRIVILEGES ON $PMADB.* TO '$PMAUSER'@'localhost';
 FLUSH PRIVILEGES;
 MYSQL_PMA3
+else
+# MySQL8
+mysql -uroot <<MYSQL_PMA3
+USE $PMADB;
+GRANT ALL ON $PMADB.* TO '$PMAUSER'@'localhost';
+FLUSH PRIVILEGES;
+MYSQL_PMA3
+fi
 
 #MYSQL DB and TABLES ADDITION
 mysql -uroot < /root/phpmyadmin/create_tables.sql
diff --git a/install/debian/11/pma/pma.sh b/install/debian/11/pma/pma.sh
index eb4be1108..f04f3f8e9 100644
--- a/install/debian/11/pma/pma.sh
+++ b/install/debian/11/pma/pma.sh
@@ -146,12 +146,22 @@ CREATE DATABASE $PMADB;
 MYSQL_PMA2
 
 #GRANT PMA USE SOME RIGHTS
+if [ ! -f "/etc/apt/sources.list.d/mysql.list" ]; then
+# MariaDB
 mysql -uroot <<MYSQL_PMA3
 USE $PMADB;
 GRANT USAGE ON $PMADB.* TO '$PMAUSER'@'localhost' IDENTIFIED BY '$PASS';
 GRANT ALL PRIVILEGES ON $PMADB.* TO '$PMAUSER'@'localhost';
 FLUSH PRIVILEGES;
 MYSQL_PMA3
+else
+# MySQL8
+mysql -uroot <<MYSQL_PMA3
+USE $PMADB;
+GRANT ALL ON $PMADB.* TO '$PMAUSER'@'localhost';
+FLUSH PRIVILEGES;
+MYSQL_PMA3
+fi
 
 #MYSQL DB and TABLES ADDITION
 mysql -uroot < /root/phpmyadmin/create_tables.sql