Merge remote-tracking branch 'origin/master'

This commit is contained in:
Marwolf
2018-07-16 21:06:57 -04:00
20 changed files with 297 additions and 79 deletions

View File

@@ -1,3 +1,6 @@
#!/bin/bash #!/bin/bash
echo "Backing up all databases."
echo ""
sudo make backup sudo make backup
echo ""

View File

@@ -1,5 +1,7 @@
@echo off @echo off
echo:
echo Backing up all databases.
echo: echo:
Windows\make backup-windows Windows\make backup-windows
echo: echo:

View File

@@ -1,9 +1,16 @@
@echo off @echo off
echo:
echo Cloning the game repository. echo Cloning the game repository.
Windows\make clone-windows-game Windows\make clone-windows-game
echo:
echo:
echo Cloning the website repository.
echo: echo:
Windows\make clone-windows-website Windows\make clone-windows-website
echo:
echo:
echo Cloning the wiki repository.
echo: echo:
Windows\make clone-windows-wiki Windows\make clone-windows-wiki
echo: echo:

View File

@@ -1,7 +1,12 @@
@echo off @echo off
echo:
echo Cloning the game repository.
echo: echo:
Windows\make clone-windows-game Windows\make clone-windows-game
echo:
echo:
echo Cloning the website repository.
echo: echo:
Windows\make clone-windows-website Windows\make clone-windows-website
echo: echo:

View File

@@ -1,5 +1,7 @@
@echo off @echo off
echo:
echo Cloning the game repository.
echo: echo:
Windows\make clone-windows-game Windows\make clone-windows-game
echo: echo:

View File

@@ -1,3 +1,7 @@
#!/bin/bash #!/bin/bash
echo ""
echo "Deleting local repositories."
echo ""
sudo make flush sudo make flush
echo ""

View File

@@ -1,5 +1,7 @@
@echo off @echo off
echo:
echo Deleting local repositories.
echo: echo:
Windows\make flush-windows Windows\make flush-windows
echo: echo:

View File

@@ -1,4 +1,17 @@
#!/bin/bash #!/bin/bash
sudo make import echo ""
echo "Attempting to import (or overwrite) the game database."
echo ""
sudo make import-game
echo ""
echo ""
echo "Attempting to import (or overwrite) the website database."
echo ""
sudo make import-website
echo ""
echo ""
echo "Attempting to import (or overwrite) the wiki database."
echo ""
sudo make import-wiki sudo make import-wiki
echo ""

View File

@@ -1,7 +1,17 @@
@echo off @echo off
echo:
echo Attempting to import (or overwrite) the game database.
echo: echo:
Windows\make import-windows-game
echo:
echo:
echo Attempting to import (or overwrite) the website database.
echo: echo:
Windows\make import-windows-website
echo:
echo:
echo Attempting to import (or overwrite) the wiki database.
echo: echo:
Windows\make import-windows-wiki Windows\make import-windows-wiki
echo: echo:

View File

@@ -29,6 +29,15 @@ clone-windows-game:
clone-windows-wiki: clone-windows-wiki:
@git clone https://github.com/Open-RSC/Wiki.git Website/Wiki @git clone https://github.com/Open-RSC/Wiki.git Website/Wiki
pull-game:
@cd Game && git pull
pull-website:
@cd Website && git pull
pull-wiki:
@cd Website/Wiki && git pull
pull-game-windows: pull-game-windows:
@cd Game && git reset HEAD --hard && git pull @cd Game && git reset HEAD --hard && git pull

View File

@@ -9,6 +9,22 @@ Choices:
___ ___
## Operating systems supported
* Windows 7 x64
* Windows 10 x64
* Mac OS X High Sierra
* Ubuntu Linux 18.04 x64
* Fedora Linux 28 x64
* CentOS 7 x64
___
## Choice 1: Download the zip, extract it, and open the "Docker-Home" folder ## Choice 1: Download the zip, extract it, and open the "Docker-Home" folder
https://github.com/Open-RSC/Docker-Home/archive/master.zip https://github.com/Open-RSC/Docker-Home/archive/master.zip

View File

@@ -1,3 +1,7 @@
#!/bin/bash #!/bin/bash
echo ""
echo "Restoring game databases from backup."
echo ""
sudo make restore sudo make restore
echo ""

View File

@@ -1,5 +1,7 @@
@echo off @echo off
echo:
echo Restoring game databases from backup.
echo: echo:
Windows\make restore-windows Windows\make restore-windows
echo: echo:

25
Run_Production_Linux_Game_Server.sh Normal file → Executable file
View File

@@ -1,5 +1,26 @@
#!/bin/bash #!/bin/bash
echo "Launching in a new window. Type 'screen -r' to view the live server screen."
echo "Use CTRL + A + D to detach the live server screen." # Check for any updates to the game server
echo "Pulling recent updates from the Open-RSC Game repository."
echo ""
echo ""
sudo make pull-game
echo ""
echo ""
# Compile the game server
echo "Compiling the game server."
echo ""
echo ""
sudo Ant/bin/ant -f Game/server/build.xml compile
echo ""
echo ""
# Run the game server in a detached screen
echo "Launching the game server in a new screen."
echo ""
echo "Type 'screen -r' to access the game server screen."
echo "Use CTRL + A + D to detach the live server screen so it runs in the background."
echo ""
echo "" echo ""
screen -dmS name ./ant_launcher.sh screen -dmS name ./ant_launcher.sh

View File

@@ -23,9 +23,10 @@ if [ "$install" == "1" ]; then
echo "Which operating system are you running?" echo "Which operating system are you running?"
echo "" echo ""
echo "${RED}1${NC} - Ubuntu Linux" echo "${RED}1${NC} - Ubuntu Linux"
echo "${RED}2${NC} - Fedora Linux" echo "${RED}2${NC} - Fedora 28 Linux"
echo "${RED}3${NC} - Mac OS" echo "${RED}3${NC} - CentOS 7 Linux"
echo "${RED}4${NC} - Other" echo "${RED}4${NC} - Mac OS High Sierra"
echo "${RED}5${NC} - Other"
echo "" echo ""
read os read os
@@ -62,6 +63,11 @@ if [ "$install" == "1" ]; then
fi fi
# UBUNTU Version <=================================================== # UBUNTU Version <===================================================
echo ""
echo ""
echo "Verifying the basics are installed."
echo ""
sudo apt update && sudo apt install unzip git build-essential apt-transport-https ca-certificates curl software-properties-common -y
echo "" echo ""
echo "" echo ""
echo "Do you have Docker installed?" echo "Do you have Docker installed?"
@@ -75,7 +81,6 @@ if [ "$install" == "1" ]; then
if [ "$docker" == "1" ]; then if [ "$docker" == "1" ]; then
echo "Attempting to install Docker now" echo "Attempting to install Docker now"
echo "" echo ""
sudo apt update && sudo apt install git build-essential apt-transport-https ca-certificates curl software-properties-common -y
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $vers stable" sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $vers stable"
sudo apt update && sudo apt install docker-ce docker-compose -y sudo apt update && sudo apt install docker-ce docker-compose -y
@@ -104,10 +109,20 @@ if [ "$install" == "1" ]; then
# Fedora OS ===================================================> # Fedora OS ===================================================>
elif [ "$os" == "2" ]; then elif [ "$os" == "2" ]; then
su -c 'yum update && yum install git'
echo "" echo ""
echo "" echo ""
echo "Do you have Java OpenJDK installed already?" echo "Verifying the basics are installed."
echo ""
sudo dnf -y update && sudo dnf -y upgrade && sudo dnf -y install screen make unzip git ca-certificates curl yum-utils device-mapper-persistent-data lvm2
echo ""
echo ""
echo "Permitting default game port 53595/tcp through the firewall."
firewall-cmd --permanent --add-port=53595/tcp
echo ""
firewall-cmd --reload
echo ""
echo ""
echo "Do you have Java OpenJDK and Apache Ant installed already?"
echo "" echo ""
echo "${RED}1${NC} - Install for me!" echo "${RED}1${NC} - Install for me!"
echo "${RED}2${NC} - Im all set" echo "${RED}2${NC} - Im all set"
@@ -116,8 +131,7 @@ if [ "$install" == "1" ]; then
# Fedora Java ===================================================> # Fedora Java ===================================================>
if [ "$java" == "1" ]; then if [ "$java" == "1" ]; then
su -c 'yum install alternatives' sudo dnf -y install ant
su -c '/usr/sbin/alternatives --config java'
else else
continue continue
fi fi
@@ -134,18 +148,114 @@ if [ "$install" == "1" ]; then
# Fedora Docker ===================================================> # Fedora Docker ===================================================>
if [ "$docker" == "1" ]; then if [ "$docker" == "1" ]; then
echo "Removing any old versions of Docker that might confict."
echo ""
sudo dnf -y remove docker \
docker-client \
docker-client-latest \
docker-common \
docker-latest \
docker-latest-logrotate \
docker-logrotate \
docker-selinux \
docker-engine-selinux \
docker-engine
echo ""
echo ""
echo "Attempting to install Docker now" echo "Attempting to install Docker now"
echo "" echo ""
curl -fsSL get.docker.com -o get-docker.sh sudo dnf -y install dnf-plugins-core
su -c 'sh get-docker.sh' sudo dnf -y config-manager \
--add-repo \
https://download.docker.com/linux/fedora/docker-ce.repo
sudo dnf -y install docker-ce docker-compose
sudo systemctl start docker
sudo systemctl enable docker
sudo usermod -aG docker $USER
else else
continue continue
fi fi
# Fedora Docker <=================================================== # Fedora Docker <===================================================
# Fedora OS <=================================================== # Fedora OS <===================================================
# Mac OS ===================================================> # CentOS 7 OS ===================================================>
elif [ "$os" == "3" ]; then elif [ "$os" == "3" ]; then
echo ""
echo ""
echo "Verifying the basics are installed."
echo ""
sudo wget http://springdale.math.ias.edu/data/puias/unsupported/7/x86_64//dnf-0.6.4-2.sdl7.noarch.rpm
sudo wget http://springdale.math.ias.edu/data/puias/unsupported/7/x86_64/dnf-conf-0.6.4-2.sdl7.noarch.rpm
sudo wget http://springdale.math.ias.edu/data/puias/unsupported/7/x86_64/python-dnf-0.6.4-2.sdl7.noarch.rpm
sudo yum -y install dnf-0.6.4-2.sdl7.noarch.rpm dnf-conf-0.6.4-2.sdl7.noarch.rpm python-dnf-0.6.4-2.sdl7.noarch.rpm
sudo dnf -y update && sudo dnf -y upgrade && sudo dnf -y install screen make unzip git ca-certificates curl yum-utils device-mapper-persistent-data lvm2
sudo yum install -y python-pip
sudo pip install --upgrade pip
sudo pip install docker-compose
sudo yum upgrade python*
echo ""
echo ""
echo "Permitting default game port 53595/tcp through the firewall."
firewall-cmd --permanent --add-port=53595/tcp
echo ""
firewall-cmd --reload
echo ""
echo ""
echo "Do you have Java OpenJDK and Apache Ant installed already?"
echo ""
echo "${RED}1${NC} - Install for me!"
echo "${RED}2${NC} - Im all set"
echo ""
read java
# CentOS 7 Java ===================================================>
if [ "$java" == "1" ]; then
sudo dnf -y install ant
else
continue
fi
# CentOS 7 Java <===================================================
echo ""
echo ""
echo "Do you have Docker installed?"
echo ""
echo "${RED}1${NC} - No, install it for me!"
echo "${RED}2${NC} - Yes"
echo ""
read docker
# CentOS 7 Docker ===================================================>
if [ "$docker" == "1" ]; then
echo "Removing any old versions of Docker that might confict."
echo ""
sudo dnf -y remove docker \
docker-client \
docker-client-latest \
docker-common \
docker-latest \
docker-latest-logrotate \
docker-logrotate \
docker-selinux \
docker-engine-selinux \
docker-engine
echo ""
echo ""
echo "Attempting to install Docker now"
echo ""
curl -fsSL https://get.docker.com/ | sh
sudo systemctl start docker
sudo systemctl enable docker
sudo usermod -aG docker $USER
sudo dnf -y install docker-compose
else
continue
fi
# CentOS 7 Docker <===================================================
# CentOS 7 OS <===================================================
# Mac OS ===================================================>
elif [ "$os" == "4" ]; then
clear clear
echo "Do you have brew installed?" echo "Do you have brew installed?"
echo "" echo ""
@@ -161,6 +271,11 @@ if [ "$install" == "1" ]; then
fi fi
# Mac Brew <=================================================== # Mac Brew <===================================================
echo ""
echo ""
echo "Verifying the basics are installed."
echo ""
brew install unzip wget git curl
echo "" echo ""
echo "" echo ""
echo "Do you have Java OpenJDK 8 installed already?" echo "Do you have Java OpenJDK 8 installed already?"
@@ -189,7 +304,7 @@ if [ "$install" == "1" ]; then
# Mac Docker ===================================================> # Mac Docker ===================================================>
if [ "$docker" == "1" ]; then if [ "$docker" == "1" ]; then
echo "Downloading the Docker for Mac installer" echo "Downloading the Docker for Mac installer"
brew install wget echo ""
wget https://download.docker.com/mac/stable/Docker.dmg wget https://download.docker.com/mac/stable/Docker.dmg
hdiutil attach Docker.dmg hdiutil attach Docker.dmg
echo "" echo ""
@@ -211,7 +326,7 @@ if [ "$install" == "1" ]; then
# Mac OS <=================================================== # Mac OS <===================================================
# Other OS ===================================================> # Other OS ===================================================>
elif [ "$os" == "4" ]; then elif [ "$os" == "5" ]; then
echo "" echo ""
echo "You will have to install Git manually then. Press enter to continue." echo "You will have to install Git manually then. Press enter to continue."
echo "" echo ""
@@ -289,19 +404,10 @@ if [ "$choice" == "1" ]; then
echo "You have picked ${GREEN}single player RSC + PHPMyAdmin!${NC}" echo "You have picked ${GREEN}single player RSC + PHPMyAdmin!${NC}"
echo "" echo ""
echo "" echo ""
echo "Checking the git repos for any recent updates."
echo ""
echo "You may now be prompted for your password so the installer has sudo access."
echo ""
cd Game && sudo git reset HEAD --hard && sudo git pull
cd ..
sudo chmod -R 777 Game
echo ""
echo ""
echo "Logging into Docker Hub to get the required images." echo "Logging into Docker Hub to get the required images."
echo "You may first need to register an account at ${RED}dockerhub.com${NC}" echo "You may first need to register an account at ${RED}dockerhub.com${NC}"
echo "" echo ""
docker login sudo docker login
echo "" echo ""
echo "" echo ""
echo "Starting up the Docker containers and stopping any existing ones." echo "Starting up the Docker containers and stopping any existing ones."
@@ -339,24 +445,10 @@ elif [ "$choice" == "2" ]; then
echo "You have picked ${GREEN}Game + Website + PHPMyAdmin!${NC}" echo "You have picked ${GREEN}Game + Website + PHPMyAdmin!${NC}"
echo "" echo ""
echo "" echo ""
echo "Checking the git repos for any recent updates."
echo ""
echo "You may now be prompted for your password so the installer has sudo access."
echo ""
cd Game && sudo git reset HEAD --hard && sudo git pull
cd ..
sudo chmod -R 777 Game
echo ""
cd Website && sudo git reset HEAD --hard && sudo git pull
cd ..
sudo chmod -R 777 Website
sudo chmod -R 644 Website/board/config.php
echo ""
echo ""
echo "Logging into Docker Hub to get the required images." echo "Logging into Docker Hub to get the required images."
echo "You may first need to register an account at ${RED}dockerhub.com${NC}" echo "You may first need to register an account at ${RED}dockerhub.com${NC}"
echo "" echo ""
docker login sudo docker login
echo "" echo ""
echo "" echo ""
echo "Starting up the Docker containers and stopping any existing ones." echo "Starting up the Docker containers and stopping any existing ones."
@@ -403,28 +495,10 @@ elif [ "$choice" == "3" ]; then
echo "You have picked ${GREEN}Game + Website + PHPMyAdmin + RSC Preservation Wiki!${NC}" echo "You have picked ${GREEN}Game + Website + PHPMyAdmin + RSC Preservation Wiki!${NC}"
echo "" echo ""
echo "" echo ""
echo "Checking the git repos for any recent updates."
echo ""
echo "You may now be prompted for your password so the installer has sudo access."
echo ""
cd Game && git sudo reset HEAD --hard && sudo git pull
cd ..
sudo chmod -R 777 Game
echo ""
cd Website && sudo git reset HEAD --hard && sudo git pull
cd ..
sudo chmod -R 777 Website
sudo chmod -R 644 Website/board/config.php
echo ""
cd Website/Wiki && sudo git reset HEAD --hard && sudo git pull
cd ..
sudo chmod -R 777 Website/Wiki
echo ""
echo ""
echo "Logging into Docker Hub to get the required images." echo "Logging into Docker Hub to get the required images."
echo "You may first need to register an account at ${RED}dockerhub.com${NC}" echo "You may first need to register an account at ${RED}dockerhub.com${NC}"
echo "" echo ""
docker login sudo docker login
echo "" echo ""
echo "" echo ""
echo "Starting up the Docker containers and stopping any existing ones." echo "Starting up the Docker containers and stopping any existing ones."

View File

@@ -1,12 +1,39 @@
#!/bin/bash #!/bin/bash
sudo make pull
#Compile # Check for any updates to the game server
echo ""
echo "Pulling recent updates from the Open-RSC Game repository."
echo ""
sudo make pull-game
echo ""
echo ""
echo "Starting any stopped Docker containers."
echo ""
sudo make start
echo ""
echo ""
# Compile the game server and client
echo "Compiling the game client."
echo ""
sudo Ant/bin/ant -f Game/client/build.xml compile sudo Ant/bin/ant -f Game/client/build.xml compile
echo ""
echo ""
echo "Compiling the game server."
echo ""
sudo Ant/bin/ant -f Game/server/build.xml compile sudo Ant/bin/ant -f Game/server/build.xml compile
echo ""
echo ""
#Client # Rune the game client in a new window
echo "Launching the game client."
echo ""
Ant/bin/ant -f Game/client/build.xml runclient & Ant/bin/ant -f Game/client/build.xml runclient &
echo ""
echo ""
#Server # Run the game server in the current window
echo "Launching the game server."
echo ""
Ant/bin/ant -f Game/server/build.xml runserver Ant/bin/ant -f Game/server/build.xml runserver
echo ""

View File

@@ -1,20 +1,35 @@
@echo off @echo off
echo: echo:
echo Pulling recent updates from the Open-RSC Game repository.
echo:
Windows\make pull-game
echo:
echo:
echo Starting any stopped Docker containers.
echo:
Windows\make start Windows\make start
echo: echo:
echo: echo:
set PATH=Ant/bin set PATH=Ant/bin
echo: echo:
echo:
echo Compiling the game client.
echo: echo:
call ant -f Game/client/build.xml compile call ant -f Game/client/build.xml compile
echo: echo:
echo:
echo Compiling the game server.
echo: echo:
call ant -f Game/server/build.xml compile call ant -f Game/server/build.xml compile
echo: echo:
echo:
echo Starting the game client in a new window.
echo: echo:
call START "" ant -f Game/client/build.xml runclient call START "" ant -f Game/client/build.xml runclient
echo: echo:
echo:
echo Starting the game server in the current window.
echo: echo:
call ant -f Game/server/build.xml runserver call ant -f Game/server/build.xml runserver
echo: echo:

View File

@@ -1,3 +1,9 @@
#!/bin/bash #!/bin/bash
echo ""
echo "Stopping the running Docker containers."
echo ""
echo ""
sudo make stop sudo make stop
echo ""
echo ""

View File

@@ -1,8 +1,12 @@
@echo off @echo off
echo:
echo Stopping the running Docker containers.
echo: echo:
Windows\make stop Windows\make stop
echo: echo:
echo:
echo Killing any running in the background instance of the game server.
echo: echo:
tskill java /a tskill java /a
echo: echo:

14
ant_launcher.sh Normal file → Executable file
View File

@@ -1,17 +1,9 @@
#!/bin/bash #!/bin/bash
echo "Pulling recent updates from the Open-RSC Game repo"
sudo make pull
echo ""
echo ""
#Compile # Run the game server
echo "Compiling the game server"
echo "" echo ""
echo "" echo "Running the game server. Press CTRL + C to shut it down or"
sudo Ant/bin/ant -f Game/server/build.xml compile echo "CTRL + A + D to detached the screen so this runs in the background."
#Run game server
echo "Launching the game server"
echo "" echo ""
echo "" echo ""
Ant/bin/ant -f Game/server/build.xml runserver Ant/bin/ant -f Game/server/build.xml runserver