From f4d8d7220be9b4c47e414849a8c431dc0da8e78e Mon Sep 17 00:00:00 2001
From: seefo <robbie.uvanni@gmail.com>
Date: Mon, 15 Jan 2018 21:19:34 -0500
Subject: [PATCH] Added initial work for running servers

---
 build_dsrc.sh                       |  3 +--
 dsrc                                |  2 +-
 gameserver/Dockerfile               |  6 +++---
 gameserver/cfg/.gitignore           |  1 +
 gameserver/utils/create_tnsnames.sh |  3 ---
 gameserver/utils/entrypoint.sh      |  4 +++-
 run_server.sh                       | 10 ++++++++++
 src                                 |  2 +-
 8 files changed, 20 insertions(+), 11 deletions(-)
 delete mode 100644 gameserver/utils/create_tnsnames.sh
 create mode 100755 run_server.sh

diff --git a/build_dsrc.sh b/build_dsrc.sh
index 6ad3aa0..e365c02 100755
--- a/build_dsrc.sh
+++ b/build_dsrc.sh
@@ -8,5 +8,4 @@ $basedir/utils/initial_setup.sh
 docker run -v $basedir/gameserver/:/swg/:z -v $basedir/dsrc/:/swg/dsrc/:z -e SWG_BUILD_DSRC=TRUE swg-runtime
 
 # cleanup any artifacts
-rm -rf $basedir/gameserver/dsrc/*
-rm -rf $basedir/gameserver/core*
+rm -rf $basedir/gameserver/dsrc
diff --git a/dsrc b/dsrc
index 536777c..57cae9e 160000
--- a/dsrc
+++ b/dsrc
@@ -1 +1 @@
-Subproject commit 536777ce2aa8038912a74a7770cd5e02e2acac9c
+Subproject commit 57cae9e1059e8d3cc2cd3e17e47b38c4ddbabe1e
diff --git a/gameserver/Dockerfile b/gameserver/Dockerfile
index 8abdde8..6ed1ed5 100644
--- a/gameserver/Dockerfile
+++ b/gameserver/Dockerfile
@@ -5,7 +5,7 @@ MAINTAINER seefo
 run apt-get update
 run dpkg --add-architecture i386 && \
 	apt-get update && \
-	apt-get install -y alien rpm libc6:i386 libncurses5:i386 libstdc++6:i386 alien gcc-multilib g++-multilib binutils-multiarch libaio1:i386 libcurl4-gnutls-dev:i386 libpcre3:i386 libxml2:i386 libaio1 unixodbc bc python-ply
+	apt-get install -y alien rpm libc6:i386 libncurses5:i386 libstdc++6:i386 alien gcc-multilib g++-multilib binutils-multiarch libaio1:i386 libcurl4-gnutls-dev:i386 libpcre3:i386 libxml2:i386 libaio1 unixodbc bc python-ply libcurl3:i386
 
 # add redists
 add ./utils/redist/ /redist/
@@ -22,8 +22,8 @@ run cd /redist/ && \
 	update-alternatives --install /usr/bin/javac javac /opt/jdk1.8.0_151/bin/javac 100
 
 # build and install curl
-add src/external/3rd/library/curl/curl-7.45.0 /redist/curl/
-run cd /redist/curl && ./configure && make && make install
+#add src/external/3rd/library/curl/curl-7.45.0 /redist/curl/
+#run cd /redist/curl && ./configure && make && make install
 
 # env variables
 ENV JAVA_HOME /usr/java
diff --git a/gameserver/cfg/.gitignore b/gameserver/cfg/.gitignore
index d6b7ef3..1c7e5b7 100644
--- a/gameserver/cfg/.gitignore
+++ b/gameserver/cfg/.gitignore
@@ -1,2 +1,3 @@
 *
+!example/*
 !.gitignore
diff --git a/gameserver/utils/create_tnsnames.sh b/gameserver/utils/create_tnsnames.sh
deleted file mode 100644
index cfb0a96..0000000
--- a/gameserver/utils/create_tnsnames.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-mkdir -p $ORACLE_HOME/network/admin
-export TNS_ADMIN=$ORACLE_HOME/network/admin
-echo 'SWG=(DESCRIPTION =(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=$ORACLE_DB_ADDRESS)(PORT=$ORACLE_DB_PORT)))(CONNECT_DATA=(SERVICE_NAME=SWG)))' > $ORACLE_HOME/network/admin/tnsnames.ora
diff --git a/gameserver/utils/entrypoint.sh b/gameserver/utils/entrypoint.sh
index 996aa03..2419b7b 100755
--- a/gameserver/utils/entrypoint.sh
+++ b/gameserver/utils/entrypoint.sh
@@ -3,13 +3,15 @@ basedir=$PWD
 
 if [[ -z "${SWG_BUILD_DSRC}" ]]; then
 	echo "Running Server"
+	cd $basedir/cfg/
+	$basedir/bin/LoginServer -- @servercommon.cfg &
+	$basedir/bin/TaskManager -- @servercommon.cfg 
 else
 	echo "Building DSRC"
 	$basedir/utils/content/build_java_multi.sh
 	$basedir/utils/content/build_miff.sh
 	$basedir/utils/content/build_tab.sh
 	$basedir/utils/content/build_tpf_multi.sh
-
 	$basedir/utils/content/build_object_template_crc_string_tables.py
 	$basedir/utils/content/build_quest_crc_string_tables.py
 	echo "Done building DSRC"
diff --git a/run_server.sh b/run_server.sh
new file mode 100755
index 0000000..709a938
--- /dev/null
+++ b/run_server.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+basedir=$PWD
+
+# ensure that repo has been setup
+$basedir/utils/initial_setup.sh
+
+# run the docker image and build the source
+docker kill swg
+docker rm swg
+docker run -p 44453:44453/udp -p 44462-44463:44462-44463/udp -h swg -v $basedir/gameserver/:/swg/:z -v $basedir/dsrc/:/swg/dsrc/:z --name swg swg-runtime
diff --git a/src b/src
index fcdad8e..d760a79 160000
--- a/src
+++ b/src
@@ -1 +1 @@
-Subproject commit fcdad8ed446493162176eb50dd8bb9c0cff1abd7
+Subproject commit d760a794dd10f7287799604539ea34e997fc2c71