From b3f5247a55a6d9566cdcd4eeba6169470f34c290 Mon Sep 17 00:00:00 2001
From: Marwolf <cleako@gmail.com>
Date: Wed, 15 Aug 2018 08:20:43 -0400
Subject: [PATCH] Corrections needed for single player on Windows

---
 Makefile                                   | 12 ++++++------
 Windows_Installer.cmd                      |  5 +++--
 docker-compose-single-player.yml           |  2 +-
 docker-compose.yml                         |  2 +-
 etc/mariadb/{innodb-fix.cnf => innodb.cnf} |  0
 5 files changed, 11 insertions(+), 10 deletions(-)
 rename etc/mariadb/{innodb-fix.cnf => innodb.cnf} (100%)

diff --git a/Makefile b/Makefile
index d1c8d06..a01f49f 100644
--- a/Makefile
+++ b/Makefile
@@ -78,19 +78,19 @@ import-website:
 	#@docker exec -i $(shell docker-compose ps -q mysqldb) mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Website/openrsc_forum.sql 2>/dev/null
 
 import-wiki:
-	@docker exec -i $(shell docker-compose ps -q mysqldb) mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Website/Wiki/openrsc_wiki.sql 2>/dev/null
+	#@docker exec -i $(shell docker-compose ps -q mysqldb) mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Website/Wiki/openrsc_wiki.sql 2>/dev/null
 
 import-windows-game:
-	@docker exec -i mysql mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Game/Databases/openrsc_logs.sql
-	@docker exec -i mysql mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Game/Databases/openrsc_config.sql
-	@docker exec -i mysql mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Game/Databases/openrsc.sql
-	@docker exec -i mysql mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Game/Databases/openrsc_tools.sql
+	@docker exec -i mysql mysql -u"root" -p"root" < Game/Databases/openrsc_logs.sql
+	@docker exec -i mysql mysql -u"root" -p"root" < Game/Databases/openrsc_config.sql
+	@docker exec -i mysql mysql -u"root" -p"root" < Game/Databases/openrsc.sql
+	@docker exec -i mysql mysql -u"root" -p"root" < Game/Databases/openrsc_tools.sql
 
 import-windows-website:
 	#@docker exec -i mysql mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Website/openrsc_forum.sql
 
 import-windows-wiki:
-	@docker exec -i mysql mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Website/Wiki/openrsc_wiki.sql
+	#@docker exec -i mysql mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Website/Wiki/openrsc_wiki.sql
 
 flush:
 	@$(shell rm -rf Website && rm -rf Game)
diff --git a/Windows_Installer.cmd b/Windows_Installer.cmd
index a891d73..e20a5c3 100644
--- a/Windows_Installer.cmd
+++ b/Windows_Installer.cmd
@@ -259,6 +259,7 @@ md "%HOMEPATH%/OpenRSC"
 7z x "Game/client/cache.zip" -o"%HOMEPATH%/OpenRSC"
 echo:
 echo:
-echo First time setup is now complete. Go ahead and open "Start_Single_Player_Game_Windows.cmd" now.
+SET /P singleplayer=Ready to launch "Windows_Single_Player.cmd" - Press enter when ready.
 echo:
-pause
+echo:
+Windows_Single_Player.cmd
diff --git a/docker-compose-single-player.yml b/docker-compose-single-player.yml
index 987fb27..fc31997 100644
--- a/docker-compose-single-player.yml
+++ b/docker-compose-single-player.yml
@@ -26,4 +26,4 @@ services:
             - "127.0.0.1:3306:3306"
         volumes:
             - "./data/db/mysql:/var/lib/mysql"
-            - "./etc/mariadb/innodb-fix.cnf:/etc/mysql/conf.d/innodb-fix.cnf"
+            - "./etc/mariadb/innodb-fix.cnf:/etc/mysql/conf.d/innodb.cnf"
diff --git a/docker-compose.yml b/docker-compose.yml
index b62341b..7f1c90e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -67,7 +67,7 @@ services:
             - "127.0.0.1:3306:3306"
         volumes:
             - "./data/db/mysql:/var/lib/mysql"
-            - "./etc/mariadb/innodb-fix.cnf:/etc/mysql/conf.d/innodb-fix.cnf"
+            - "./etc/mariadb/innodb-fix.cnf:/etc/mysql/conf.d/innodb.cnf"
 #        logging:
 #            driver: splunk
 #            options:
diff --git a/etc/mariadb/innodb-fix.cnf b/etc/mariadb/innodb.cnf
similarity index 100%
rename from etc/mariadb/innodb-fix.cnf
rename to etc/mariadb/innodb.cnf