Script clean up

This commit is contained in:
Marwolf
2018-08-15 07:46:30 -04:00
parent 8b5fb1804e
commit 68ed60c264
3 changed files with 40 additions and 59 deletions

View File

@@ -12,29 +12,22 @@ echo ""
echo ""
echo "Starting Docker containers."
echo ""
sudo make stop
sudo make start-single-player
echo ""
echo ""
cd Game
if git diff --name-only | grep -o '[a-zA-Z0-9]*.java' > /dev/null; then
# Compile the game server and client
echo "Compiling the game client."
echo ""
sudo ant -f "client/build.xml" compile
#sudo gradle -b "client/build.gradle" compile
echo ""
echo ""
echo "Compiling the game server."
echo ""
sudo ant -f "server/build.xml" compile
#sudo gradle -b "server/build.gradle" compile
echo ""
echo ""
fi
cd ../
# Compile the game server and client
echo "Compiling the game client."
echo ""
sudo ant -f "Game/client/build.xml" compile
echo ""
echo ""
echo "Compiling the game server."
echo ""
sudo ant -f "Game/server/build.xml" compile
echo ""
echo ""
#Create game cache
echo "Removing old cache if exists and then extracting a fresh client cache to your home folder."
@@ -45,34 +38,28 @@ unzip -o Game/client/cache.zip -d ~/OpenRSC >/dev/null
echo ""
echo ""
cd Game
if git diff --name-only | grep -o '[a-zA-Z0-9]*.sql' > /dev/null; then
#Import fresh version of config database
echo "Importing a fresh openrsc_config.sql database."
echo ""
sudo docker exec -i $(sudo docker-compose ps -q mysqldb) mysql -u"$MYSQL_ROOT_USER" -p"$MYSQL_ROOT_PASSWORD" < Game/Databases/openrsc_config.sql 2>/dev/null
echo ""
echo ""
#Import fresh version of config database
echo "Importing a fresh openrsc_config.sql database."
echo ""
sudo docker exec -i $(sudo docker-compose ps -q mysqldb) mysql -u"$MYSQL_ROOT_USER" -p"$MYSQL_ROOT_PASSWORD" < Game/Databases/openrsc_config.sql 2>/dev/null
echo ""
echo ""
#Generate updated cache files, copies them to cache folder overwriting existing
echo "Generating cache .dat files from current config database and copying to client cache in your home folder."
echo ""
sudo ant -f Game/server/build.xml npcs items objects > /dev/null
yes | cp -rf Game/server/npcs.dat ~/OpenRSC/npcs.dat
yes | cp -rf Game/server/objects.dat ~/OpenRSC/objects.dat
yes | cp -rf Game/server/items.dat ~/OpenRSC/items.dat
echo ""
echo ""
fi
cd ../
#Generate updated cache files, copies them to cache folder overwriting existing
echo "Generating cache .dat files from current config database and copying to client cache in your home folder."
echo ""
sudo ant -f Game/server/build.xml npcs items objects > /dev/null
yes | cp -rf Game/server/npcs.dat ~/OpenRSC/npcs.dat
yes | cp -rf Game/server/objects.dat ~/OpenRSC/objects.dat
yes | cp -rf Game/server/items.dat ~/OpenRSC/items.dat
echo ""
echo ""
# Run the game client in a new window
echo "Launching the game client."
echo ""
ant -f Game/client/build.xml runclient &
#java -jar Game/client/Open_RSC_Client.jar &
#ant -f Game/client/build.xml runclient &
java -jar Game/client/Open_RSC_Client.jar &
echo ""
echo ""