From 8654e78836e739f69ac40bdb1cc5a8fc815c58c1 Mon Sep 17 00:00:00 2001
From: Marwolf <cleako@gmail.com>
Date: Thu, 12 Jul 2018 20:21:49 -0400
Subject: [PATCH] Moved wiki to own scripts due to size

---
 Add Wiki.cmd              | 13 +++++++++++++
 First time setup.cmd      |  6 ------
 Makefile                  |  6 +++++-
 add-wiki.sh               |  4 ++++
 first-time-setup-linux.sh |  2 +-
 5 files changed, 23 insertions(+), 8 deletions(-)
 create mode 100644 Add Wiki.cmd
 create mode 100644 add-wiki.sh

diff --git a/Add Wiki.cmd b/Add Wiki.cmd
new file mode 100644
index 0000000..8974ace
--- /dev/null
+++ b/Add Wiki.cmd	
@@ -0,0 +1,13 @@
+@echo off
+
+cls
+echo Downloading a copy of the Wiki repository
+echo:
+Windows\make clone-windows-wiki
+
+cls
+echo Importing the databases.
+echo:
+Windows\make import-windows-wiki
+
+pause
diff --git a/First time setup.cmd b/First time setup.cmd
index 535291f..4f1d205 100644
--- a/First time setup.cmd	
+++ b/First time setup.cmd	
@@ -27,17 +27,11 @@ echo Downloading a copy of the Game repository
 echo:
 Windows\make clone-windows-game
 
-cls
-echo Downloading a copy of the Wiki repository
-echo:
-Windows\make clone-windows-wiki
-
 cls
 echo Importing the databases.
 echo:
 Windows\make import-windows
 
-
 cls
 echo Extracting client cache
 echo:
diff --git a/Makefile b/Makefile
index f13b6d0..1df4618 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ restart: init
 	@docker-compose down -v
 	docker-compose up -d
 
-clone:
+clone-game-website:
 	@$(shell git clone https://github.com/Open-RSC/Website.git)
 	@$(shell git clone https://github.com/Open-RSC/Game.git)
 	@$(shell cd Website && git clone https://github.com/Open-RSC/Wiki.git)
@@ -60,6 +60,8 @@ import:
 	@docker exec -i $(shell docker-compose ps -q mysqldb) mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Game/Databases/openrsc_logs.sql 2>/dev/null
 	@docker exec -i $(shell docker-compose ps -q mysqldb) mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Game/Databases/openrsc.sql 2>/dev/null
 	@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
 
 import-windows:
@@ -67,6 +69,8 @@ import-windows:
 	@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)" < 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
 
 flush:
diff --git a/add-wiki.sh b/add-wiki.sh
new file mode 100644
index 0000000..fa3c3ac
--- /dev/null
+++ b/add-wiki.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+clear
+sudo make clone-wiki
+sudo make import-wiki
diff --git a/first-time-setup-linux.sh b/first-time-setup-linux.sh
index 955c3a7..604a1bf 100755
--- a/first-time-setup-linux.sh
+++ b/first-time-setup-linux.sh
@@ -4,7 +4,7 @@ git pull
 docker login
 sudo make stop
 sudo make start
-sudo make clone
+sudo make clone-game-website
 sudo make import
 mkdir ~/OpenRSC
 unzip Game/client/cache.zip -d ~/OpenRSC