diff --git a/Makefile b/Makefile index 3bf2a5b..2f156e8 100644 --- a/Makefile +++ b/Makefile @@ -58,10 +58,13 @@ restore: restore-windows: @docker exec -i mysql mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < $(MYSQL_DUMPS_DIR)/db.sql -import: +import-game: @docker exec -i $(shell docker-compose ps -q mysqldb) mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Game/Databases/openrsc_config.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_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)" < Game/Databases/openrsc_tools.sql 2>/dev/null + +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: @@ -71,6 +74,7 @@ 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 import-windows-website: @docker exec -i mysql mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Website/openrsc_forum.sql diff --git a/Setup_Linux_Mac.sh b/Setup_Linux_Mac.sh index 1f9d294..14417e7 100755 --- a/Setup_Linux_Mac.sh +++ b/Setup_Linux_Mac.sh @@ -323,9 +323,9 @@ if [ "$choice" == "1" ]; then unzip -o Game/client/cache.zip -d ~/OpenRSC echo "" echo "" - echo "Importing the databases." + echo "Importing the game databases." echo "" - sudo make import + sudo make import-game echo "" echo "" echo "Open RSC setup complete!" @@ -382,9 +382,14 @@ elif [ "$choice" == "2" ]; then unzip -o Game/client/cache.zip -d ~/OpenRSC echo "" echo "" - echo "Importing the databases in 15 seconds." + echo "Importing the game databases." echo "" - sudo make import + sudo make import-game + echo "" + echo "" + echo "Importing the website database." + echo "" + sudo make import-website echo "" echo "" echo "Open RSC setup complete!" @@ -453,9 +458,17 @@ elif [ "$choice" == "3" ]; then unzip -o Game/client/cache.zip -d ~/OpenRSC echo "" echo "" - echo "Importing the game, forum, and wiki databases." + echo "Importing the game databases." echo "" - sudo make import + sudo make import-game + echo "" + echo "" + echo "Importing the website database." + echo "" + sudo make import-website + echo "" + echo "" + echo "Importing the wiki database." echo "" sudo make import-wiki echo ""