From 2201cd39f2ff9a75ed6f5471bedc6030a4dc30fd Mon Sep 17 00:00:00 2001
From: "b.waal" <b.waal79@upcmail.nl>
Date: Sun, 15 Sep 2019 17:24:16 +0200
Subject: [PATCH] Update 'installer.sh'

---
 installer.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/installer.sh b/installer.sh
index 058ed88..13e8ee4 100644
--- a/installer.sh
+++ b/installer.sh
@@ -227,13 +227,15 @@ systemctl restart nginx
 ##-----------------------##
 #    MySQL Installation   #
 ##-----------------------##
-whiptail --title "Installing MySQL" --infobox "Busy like a bee" 8 45
+#whiptail --title "Installing MySQL" --infobox "Busy like a bee" 8 45
+whiptail --gauge "Installing MySQL" 6 50 0
 wget -q -t7 https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-MySQL/raw/branch/master/mysql-8.0.sh -O /tmp/mysql-8.0.sh
 source /tmp/mysql-8.0.sh >/dev/null
 
 ##------------------------------##
 #    MySQL_Secure_Installation   #
 ##------------------------------##
+whiptail --gauge "Installing MySQL" 6 50 37
 mysql -u root -p"$password" -e "DELETE FROM mysql.user WHERE User='root' AND Host NOT IN ('localhost', '127.0.0.1', '::1')" >/dev/null
 mysql -u root -p"$password" -e "DELETE FROM mysql.user WHERE User=''" >/dev/null
 mysql -u root -p"$password" -e "DELETE FROM mysql.db WHERE Db='test' OR Db='test\_%'" >/dev/null
@@ -244,16 +246,18 @@ mysql -u root -p"$password" -e "FLUSH PRIVILEGES;" >/dev/null
 ##-----------------------------##
 #    MySQL Database Creation    #
 ##-----------------------------##
+whiptail --gauge "Installing MySQL" 6 50 77
 mysql -u root -p"$password" -e "CREATE DATABASE postfixadmin;" >/dev/null
 mysql -u root -p"$password" -e "CREATE USER '"postfixadmin"'@'localhost' IDENTIFIED BY '"$password"';" >/dev/null
 mysql -u root -p"$password" -e "GRANT ALL ON "postfixadmin".* TO "postfixadmin"@'localhost';" >/dev/null
 mysql -u root -p"$password" -e "FLUSH PRIVILEGES;" >/dev/null
-
+whiptail --gauge "Installing MySQL" 6 50 100
+sleep 2
 ##------------------##
 #    PostfixADMIN    #
 ##------------------##
-$PKGM php${phpver} php${phpver}-zip php${phpver}-fpm php${phpver}-cli php${phpver}-json php${phpver}-mysql php${phpver}-opcache php${phpver}-mbstring php${phpver}-readline
-$PKGM libc-client2007e mlock php${phpver}-common php${phpver}-imap
+$PKGI php${phpver} php${phpver}-zip php${phpver}-fpm php${phpver}-cli php${phpver}-json php${phpver}-mysql php${phpver}-opcache php${phpver}-mbstring php${phpver}-readline
+$PKGI libc-client2007e mlock php${phpver}-common php${phpver}-imap
 whiptail --title "Configuring PostfixADMIN" --infobox "Busy like a bee" 8 45
 mkdir -p /var/www/"$domain"/html/postfixadmin/templates_c
 wget -q -t7 https://git.ictmaatwerk.com/downloads/pfa/postfixadmin-3.1.tar.gz -O /tmp/postfixadmin.tar.gz