From fb25d77a91080a02bb30c0eb9a122ab7fa07a56e Mon Sep 17 00:00:00 2001
From: Stefan Pejcic <stefan@pejcic.rs>
Date: Wed, 22 May 2024 19:40:32 +0200
Subject: [PATCH] Update UPDATE.sh

---
 version/0.1.7/UPDATE.sh | 34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/version/0.1.7/UPDATE.sh b/version/0.1.7/UPDATE.sh
index 056f2ce..f245645 100644
--- a/version/0.1.7/UPDATE.sh
+++ b/version/0.1.7/UPDATE.sh
@@ -666,16 +666,14 @@ celebrate() {
 }
 
 
-
+# MySQL
 replace_mysql_with_docker() {
-    # MySQL
-
-
-
-# EXPORT DATABASE!
-mysqldump --defaults-extra-file="/usr/local/admin/db.cnf" panel > /tmp/DATABASE.sql
-
 
+    # EXPORT DATABASE!
+    mysqldump --defaults-extra-file="/usr/local/admin/db.cnf" panel > /tmp/DATABASE.sql
+    
+    # stop mysql service on the server
+    service mysql stop
 
     # set random password
     MYSQL_ROOT_PASSWORD=$(openssl rand -base64 -hex 9)
@@ -744,6 +742,11 @@ mysqldump --defaults-extra-file="/usr/local/admin/db.cnf" panel > /tmp/DATABASE.
         # Check if SQL file was imported successfully
         if mysql --defaults-extra-file="/usr/local/admin/db.cnf" -D "panel" -e "SELECT 1 FROM plans LIMIT 1;" &> /dev/null; then
             echo -e "${GREEN}Database is ready.${RESET}"
+
+            service mysql disable
+            # leave for next version!
+            # apt-get uninstall -y mysql 
+            
         else
             echo "SQL file import failed or database is not ready."
             radovan 1 "Installation failed!"
@@ -754,19 +757,10 @@ mysqldump --defaults-extra-file="/usr/local/admin/db.cnf" panel > /tmp/DATABASE.
         echo "Installation failed! "
         exit 1
     fi
-
-
-
-
-
-
-
-
-    
-
-        
 }
 
+
+
 post_install_message() {
 
     # steps to revert the update
@@ -780,7 +774,7 @@ post_install_message() {
     echo ""
     echo "   mv /usr/local/admin-${CURRENT_PANEL_VERSION}/ /usr/local/admin ; mv /usr/local/panel-${CURRENT_PANEL_VERSION}/ /usr/local/panel"
     echo ""
-    echo "3. Restart OpenPanel and OpenAdmin serviced:"
+    echo "3. Restart OpenPanel, OpenAdmin and MySQL services:"
     echo ""
     echo "   service panel restart && service admin restart"
     echo ""