Wording changes, tweaked things, it installs Oracle JDK 8 now

This commit is contained in:
Marwolf
2018-08-10 21:05:19 -04:00
parent 8f97277ad8
commit eaf9f79534
2 changed files with 73 additions and 180 deletions

View File

@@ -8,19 +8,10 @@ cls
echo Open RSC Installer:
echo:
echo An easy to run RSC private server environment using Docker magic.
echo:
echo Installing the required Chocolatey base system.
echo:
@"%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell.exe" -NoProfile -InputFormat None -ExecutionPolicy Bypass -Command "iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" && SET "PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin"
echo An easy to run RSC private server using Docker magic.
echo:
echo:
echo Installing basic software needed to run the rest of this script.
echo:
choco install -y 7zip.install make
echo:
echo:
echo Before continuing, Open RSC needs to know if you have Java JDK, Docker, and Git installed.
echo Before continuing, Open RSC needs to know if you have Oracle Java JDK 8, Docker, and Git installed.
echo This installer can install one or both for you if needed.
echo:
echo Choices:
@@ -40,7 +31,17 @@ Setup_Windows.cmd
:doinstall
echo:
echo Do you have Java JDK 8 and Apache Ant installed already?"
echo Installing the required Chocolatey base system.
echo:
@"%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell.exe" -NoProfile -InputFormat None -ExecutionPolicy Bypass -Command "iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" && SET "PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin"
echo:
echo:
echo Installing basic software needed to run the rest of this script.
echo:
choco install -y 7zip.install make
echo:
echo:
echo Do you have Oracle Java JDK 8 and Apache Ant installed already? It is required for this.
echo:
echo Choices:
echo 1 - Install for me!
@@ -58,7 +59,7 @@ goto doinstall
:installjava
echo:
echo Installing Java JDK and Apache Ant.
echo Installing Oracle Java JDK 8 and Apache Ant.
echo:
choco install -y jdk8 ant
echo:
@@ -67,7 +68,7 @@ goto askdocker
:askdocker
echo:
echo Do you have Docker installed already?
echo Do you have Docker installed already? It is required for this.
echo:
echo Choices:
echo 1 - Install for me!
@@ -85,7 +86,7 @@ goto askdocker
:installdocker
echo:
echo Installing Docker.
echo Installing Docker for Windows.
echo:
choco install -y docker-for-windows
echo:
@@ -107,7 +108,7 @@ goto askgit
:askgit
echo:
echo Do you have Git installed already?
echo Do you have Git installed already? It is required for this.
echo:
echo Choices:
echo 1 - Install for me!
@@ -125,7 +126,7 @@ goto askgit
:installgit
echo:
echo Installing Git
echo Installing Git.
echo:
choco install -y git.install
echo:
@@ -134,11 +135,11 @@ goto askide
:askide
echo:
echo Do you want a programming IDE installed?
echo Do you want a programming IDE installed for editing code?
echo:
echo Choices:
echo 1 - Install NetBeans
echo 2 - Install IntelliJ IDEA Community Edition
echo 1 - Install NetBeans (projects already created in repo)
echo 2 - Install IntelliJ IDEA Community Edition (projects already created in repo)
echo 3 - Install Eclipse
echo 4 - I'm all set, continue!
echo:
@@ -179,9 +180,6 @@ echo:
git pull
echo:
echo:
docker login
echo:
echo:
echo Attempting to stop any running Docker containers.
echo:
make stop
@@ -196,11 +194,11 @@ echo:
:edition
echo:
echo Open RSC Installer
echo An easy to run RSC private server environment using Docker magic.
echo An easy to run RSC private server using Docker magic.
echo:
echo Choices:
echo 1 - Single player RSC game + basic database editing (using PHPMyAdmin)
echo 2 - Game + Website + PHPMyAdmin
echo 1 - Set up for single player
echo 2 - Deployment for a publicly hosted server
echo:
SET /P edition=Which of the above do you want? Type 1, 2, or 3, and press enter."
echo:
@@ -234,11 +232,13 @@ echo:
echo Downloading a copy of the Website repository
echo:
make clone-windows-website
make pull-website-windows
echo:
echo:
echo Downloading a copy of the Game repository
echo:
make clone-windows-game
make pull-game-windows
echo:
echo:
make pull-game-windows
@@ -248,57 +248,6 @@ echo:
make import-windows-game
echo:
echo:
echo Importing the website database.
echo:
make pull-website-windows
echo:
make import-windows-website
echo:
echo:
goto final
:gamewebwiki
echo:
echo Downloading a copy of the Website repository
echo:
make clone-windows-website
echo:
echo:
echo Downloading a copy of the Game repository
echo:
make clone-windows-game
echo:
echo:
make pull-wiki-windows
echo:
echo Downloading a copy of the Wiki repository
echo:
make clone-windows-wiki
echo:
echo:
make pull-game-windows
echo:
echo Importing the game databases.
echo:
make import-windows-game
echo:
echo:
echo Importing the website database.
echo:
make pull-website-windows
echo:
make import-windows-website
echo:
echo:
echo Extracting Wiki database
echo:
7z x "Website/Wiki/openrsc_wiki.sql.zip" -o"Website/Wiki"
echo:
echo:
echo Importing the wiki database.
echo:
make import-windows-wiki
echo:
goto final
:final
@@ -309,6 +258,6 @@ md "%HOMEPATH%/OpenRSC"
7z x "Game/client/cache.zip" -o"%HOMEPATH%/OpenRSC" -r
echo:
echo:
echo First time setup is now complete. Go ahead and open "Start Game.cmd" now.
echo First time setup is now complete. Go ahead and open "Start_Single_Player_Game_Windows.cmd" now.
echo:
pause