diff --git a/Import_Databases_Windows.cmd b/Import_Databases_Windows.cmd index 8f76843..5244608 100644 --- a/Import_Databases_Windows.cmd +++ b/Import_Databases_Windows.cmd @@ -1,6 +1,7 @@ @echo off echo: -Windows\make import-windows +Windows\make import-windows-game +Windows\make import-windows-website Windows\make import-windows-wiki echo: pause diff --git a/Makefile b/Makefile index 2321581..dbbb002 100644 --- a/Makefile +++ b/Makefile @@ -13,22 +13,20 @@ restart: init clone-game: @$(shell git clone https://github.com/Open-RSC/Game.git) - #@$(&& sudo chmod -R 777 Game) clone-website: @$(shell git clone https://github.com/Open-RSC/Website.git) - #@$(shell sudo chmod -R 777 Website && sudo chmod 644 Website/board/config.php) clone-wiki: @$(shell cd Website && git clone https://github.com/Open-RSC/Wiki.git) clone-windows-website: @git clone https://github.com/Open-RSC/Website.git - #icacls Website /grant Everyone:F /t + cacls Website /grant Everyone:F /t clone-windows-game: @git clone https://github.com/Open-RSC/Game.git - #icacls Game /grant Everyone:F /t + cacls Game /grant Everyone:F /t clone-windows-wiki: @git clone https://github.com/Open-RSC/Wiki.git Website/Wiki @@ -68,10 +66,12 @@ import: 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: +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 + +import-windows-website: @docker exec -i mysql mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Website/openrsc_forum.sql import-windows-wiki: diff --git a/Setup_Linux_Mac.sh b/Setup_Linux_Mac.sh index df88721..1f9d294 100755 --- a/Setup_Linux_Mac.sh +++ b/Setup_Linux_Mac.sh @@ -264,11 +264,12 @@ fi # Install Choice <=================================================== clear -echo "Checking the Docker Home git repo for any recent updates." +echo "Checking for updates to the Docker-Home repository." echo "" git reset HEAD --hard && git pull echo "" -clear +echo "" +echo "" echo "${RED}Open RSC Installer:${NC} An easy to run RSC private server environment using Docker magic. diff --git a/Setup_Windows.cmd b/Setup_Windows.cmd index 9476cf1..6fe1c4d 100644 --- a/Setup_Windows.cmd +++ b/Setup_Windows.cmd @@ -1,6 +1,130 @@ @echo off +SETLOCAL ENABLEEXTENSIONS +set RED=Color 04 +set GREEN=Color 0A +set NC=Color 0F +cls +echo Open RSC Installer: +echo: +echo An easy to run RSC private server environment using Docker magic. +echo: +echo Before continuing, Open RSC needs to know if you have Java, Docker, and Git installed. +echo This installer can install one or both for you if needed. +echo: +echo Choices: +echo 1 - Install for me! +echo 2 - I'm all set, continue! (default)" +echo: +SET /P install=Please enter a number choice from above: +echo: + +IF /i "%install%"=="1" goto doinstall +IF /i "%install%"=="2" goto skip + +echo Error! %install% is not a valid option. Press enter to try again." +echo: +SET /P install="" +Setup_Windows.cmd + +:doinstall +echo: +echo Do you have Java OpenJDK installed already?" +echo: +echo Choices: +echo 1 - Install for me! +echo 2 - I'm all set, continue! (default)" +echo: +SET /P java=Please enter a number choice from above: +echo: +IF /i "%java%"=="1" goto installjava +IF /i "%java%"=="2" goto askdocker + +echo Error! %java% is not a valid option. Press enter to try again." +echo: +SET /P java="" +goto doinstall + +:installjava +echo: +echo Downloading Java OpenJDK. +echo: +"Windows/wget.exe" "http://download.oracle.com/otn-pub/java/jdk/10.0.1+10/fb4372174a714e6b8c52526dc134031e/jdk-10.0.1_windows-x64_bin.exe" --no-check-certificate +echo: +echo Download complete. Installing Oracle Java JDK 10. +echo: +"jdk-10.0.1_windows-x64_bin.exe" +echo: +SET /P install="Please follow the Java install prompts and press enter here once finished." +echo: +goto askdocker + +:askdocker +echo: +echo Do you have Docker installed already? +echo: +echo Choices: +echo 1 - Install for me! +echo 2 - I'm all set, continue! (default)" +echo: +SET /P docker=Please enter a number choice from above: +echo: +IF /i "%docker%"=="1" goto installdocker +IF /i "%docker%"=="2" goto askgit + +echo Error! %docker% is not a valid option. Press enter to try again." +echo: +SET /P docker="" +goto askdocker + +:installdocker +echo: +echo Downloading Docker. +echo: +"Windows/wget.exe" "https://download.docker.com/win/stable/Docker%20for%20Windows%20Installer.exe" +echo: +echo Download complete. Installing Docker. +echo: +"Docker%20for%20Windows%20Installer.exe" +echo: +SET /P install="Please follow the Docker install prompts and press enter here once finished." +echo: +goto askgit + +:askgit +echo: +echo Do you have Git installed already? +echo: +echo Choices: +echo 1 - Install for me! +echo 2 - I'm all set, continue! (default)" +echo: +SET /P git=Please enter a number choice from above: +echo: +IF /i "%git%"=="1" goto installgit +IF /i "%git%"=="2" goto skip + +echo Error! %git% is not a valid option. Press enter to try again." +echo: +SET /P git="" +goto askgit + +:installgit +echo: +"Windows/wget.exe" "https://github.com/git-for-windows/git/releases/download/v2.18.0.windows.1/Git-2.18.0-64-bit.exe" +echo: +echo Installing Git. +echo: +"Git-2.18.0-64-bit.exe" +echo: +SET /P install="Please follow the Git install prompts and press enter here once finished." +echo: +goto skip + +:skip +echo: +echo Checking for updates to the Docker-Home repository. echo: git pull echo: @@ -18,6 +142,18 @@ echo: Windows\make start echo: echo: +echo: +echo Open RSC Installer +echo An easy to run RSC private server environment using Docker magic. +echo: +echo Choices: +echo 1 - Single player RSC game + basic database editing (using PHPMyAdmin) +echo 2 - Game + Website + PHPMyAdmin +echo 3 - Game + Website + PHPMyAdmin + RSC Preservation Wiki +echo: +SET /P choice=Which of the above do you want? Type 1, 2, or 3, and press enter." +echo: +echo: echo Downloading a copy of the Website repository echo: Windows\make clone-windows-website diff --git a/Windows/wget.exe b/Windows/wget.exe new file mode 100644 index 0000000..d1f9343 Binary files /dev/null and b/Windows/wget.exe differ