Update '.doweFiles/mysql_install.sh'

.doweFiles/mysql_install.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+# !/bin/sh
 # mysql -h "server-name" "database-name" < "filename.sql"
 #	
 #	mysql -p=password -u "root" -Bse "CREATE DATABASE \`${1}_database\`;
@@ -6,12 +6,6 @@
 #		GRANT ALL PRIVILEGES ON `${1}_database`.* TO '$1'@'%' WITH GRANT OPTION;"
 #
 #
-<<<<<<< HEAD
-MYSQL_ROOT="root"
-MYSQL_PASS="password"
-MYSQL_USER="mrjohndowe"
-MYSQL_USER_PASS="53nrw695"
-=======
 myConfig = "rootConfig.cnf"
 MYSQL_ROOT="root"
 MYSQL_PASS="rootme"
@@ -20,7 +14,6 @@ MYSQL_USER_PASS="53nrw695"
 # Temporary Directory
 TMP="/var/tmp/"
 REPO="https://scm.genesisrage.net/mrjohndowe/Raspi-Config/raw/branch/master/.doweFiles/"
->>>>>>> master
 
 sudo clear;
 echo "Getting ready to install MYSQL on Pi";
@@ -36,7 +29,6 @@ echo "Getting the files for the database server";
 echo "";
 sudo apt install mariadb-server -y;
 echo "Running the MySQL securing process";
-<<<<<<< HEAD
 echo "ATTENTION: User input needed....";
 sleep 60;
 sudo mysql_secure_installation;
@@ -62,7 +54,7 @@ if($ANSWER == "Y")
 else 
 	echo "Goodbye";
 fi
-=======
+
 echo "ATTENTION: User input may be needed....";
 sleep 30
 sudo mysql_secure_installation
@@ -74,5 +66,3 @@ sudo apt install php8.0-mysql -y;
 sudo mv ~/.my.cnf ~/.my.cnf.BAK;
 sudo curl -s $REPO/$myConfig > ~/.my.cnf
 echo "MySQL installation complete";
-
->>>>>>> master