From 371ca3fd0b4cb8d32803817ba56da88705e992ea Mon Sep 17 00:00:00 2001
From: BitMaster Admin <bitmaster@noreply.git.bitmaster.cc>
Date: Fri, 18 Oct 2024 10:17:25 +0300
Subject: [PATCH] Update install.sh

---
 install.sh | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/install.sh b/install.sh
index 0f46c71..a33f0fc 100644
--- a/install.sh
+++ b/install.sh
@@ -121,7 +121,21 @@ while true; do
     fi
 done
 
-# Set up the MySQL server with the provided password
+# Prompt the user to enter the Ministra MySQL user password twice
+while true; do
+    read -s -p "Please enter a Ministra MySQL user password: " stalkerpass
+    echo
+    read -s -p "Please confirm the Ministra MySQL user password: " stalkerpass_confirm
+    echo
+    if [ "$stalkerpass" == "$stalkerpass_confirm" ]; then
+        echo "Ministra MySQL user password confirmed."
+        break
+    else
+        echo "Passwords do not match. Please try again."
+    fi
+done
+
+# Set up the MySQL server with the provided root password
 export DEBIAN_FRONTEND="noninteractive"
 echo "mysql-server mysql-server/root_password password $rootpass" | sudo debconf-set-selections
 check_exit_status "Setting MySQL root password"
@@ -129,27 +143,17 @@ echo "mysql-server mysql-server/root_password_again password $rootpass" | sudo d
 check_exit_status "Confirming MySQL root password"
 apt-get install -y mysql-server
 check_exit_status "Installing MySQL Server"
-echo "###########################################"
 
-# Create Ministra MySQL users and database
 echo "Creating Ministra MySQL Users..."
-mysql -uroot -p$rootpass -e "create database stalker_db;"
-mysql -uroot -p$rootpass -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY '${rootpass}';"
-mysql -uroot -p$rootpass -e "CREATE USER 'stalker'@'localhost' IDENTIFIED BY '${stalkerpass}';"
-mysql -uroot -p$rootpass -e "GRANT ALL ON stalker_db.* TO 'stalker'@'localhost' WITH GRANT OPTION;"
-mysql -uroot -p$rootpass -e "ALTER USER 'stalker'@'localhost' IDENTIFIED WITH mysql_native_password BY '${stalkerpass}';"
-mysql -uroot -p$rootpass -e "FLUSH PRIVILEGES;"
+mysql -uroot -p"$rootpass" -e "create database stalker_db;"
+mysql -uroot -p"$rootpass" -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY '${rootpass}';"
+mysql -uroot -p"$rootpass" -e "CREATE USER 'stalker'@'localhost' IDENTIFIED BY '${stalkerpass}';"
+mysql -uroot -p"$rootpass" -e "GRANT ALL ON stalker_db.* TO 'stalker'@'localhost' WITH GRANT OPTION;"
+mysql -uroot -p"$rootpass" -e "ALTER USER 'stalker'@'localhost' IDENTIFIED WITH mysql_native_password BY '${stalkerpass}';"
+mysql -uroot -p"$rootpass" -e "FLUSH PRIVILEGES;"
 check_exit_status "Creating Ministra MySQL users"
 echo "###########################################"
 
-echo "Configuring MySQL..."
-echo 'sql_mode=""' >> /etc/mysql/mysql.conf.d/mysqld.cnf
-echo 'extension=geoip.so' >> /etc/php/7.0/apache2/php.ini
-echo 'default_authentication_plugin=mysql_native_password' >> /etc/mysql/mysql.conf.d/mysqld.cnf
-service mysql restart
-check_exit_status "Restarting MySQL service"
-echo "###########################################"
-
 echo "Installing Ministra..."
 cd /var/www/html/
 wget $ministra_source