dahjah/hostile-takeover
1
0
Fork 0
mirror of https://github.com/spiffcode/hostile-takeover.git synced 2026-04-10 21:11:29 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Unify content download in ./run

Browse Source 
Also change the leaderboard port and address to 127.0.0.1:8080
This commit is contained in:
Scott Ludwig 2016-01-09 12:44:21 -08:00
parent 087a9eae7d
commit ac148a79f1
1 changed files with 33 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
server/run
View File

@ -1,7 +1,7 @@
#!/bin/bash
SERVER_DIR="$(cd "${0%/*}" && echo $PWD)"
LEADERBOARD_ADDRESS_AND_PORT="$(${SERVER_DIR}/docker/config LEADERBOARD_ADDRESS_AND_PORT)"
LEADERBOARD_ADDRESS_AND_PORT="127.0.0.1:8080"
# Usage:
#
@ -11,6 +11,36 @@ LEADERBOARD_ADDRESS_AND_PORT="$(${SERVER_DIR}/docker/config LEADERBOARD_ADDRESS_
# Set DOCKER=0 to run without docker (runs with docker by default)
# Set REL=1 to run release (runs debug by default)
prepare_content() {
# Attempt putting test data in place
if [ -f "${SERVER_DIR}/docker/wicontent/wi/index" ]; then
return
fi
# Expand test data if it exists
if [ -f "${SERVER_DIR}/testdata.tar.gz" ]; then
echo Untaring testdata.tar.gz...
tar -xf "${SERVER_DIR}/testdata.tar.gz" -C "${SERVER_DIR}/docker/wicontent"
mv "${SERVER_DIR}/docker/wicontent/testdata" "${SERVER_DIR}/docker/wicontent/wi"
else
# Test data doesn't exist. Attempt download
WICONTENT_URL="$(${SERVER_DIR}/docker/config WICONTENT_URL)"
if [ ! -z "${WICONTENT_URL}" ]; then
echo Attempting download of wicontent.tar.gz...
local ETAG=$(curl -s -D - "${WICONTENT_URL}" -o "${SERVER_DIR}/docker/wicontent/wicontent.tar.gz" | grep ETag | cut -d: -f2 | cut -d\" -f2)
if [ ! -z "${ETAG}" ]; then
echo -n "${ETAG}" > "${SERVER_DIR}/docker/wicontent/wicontent.tar.gz-etag"
tar -xf "${SERVER_DIR}/docker/wicontent/wicontent.tar.gz" -C "${SERVER_DIR}/docker/wicontent"
fi
fi
fi
if [ ! -f "${SERVER_DIR}/docker/wicontent/wi/index" ]; then
echo "Mission pack info missing ${SERVER_DIR}/docker/wicontent"
exit 1
fi
}
run_with_docker() {
# Ensure control-c goes to docker, not this script
set -m
@ -26,47 +56,12 @@ run_with_docker() {
DEBUGGER="--debugger ${DEBUGGER}"
fi
# Prepare test data once, for faster iteration
if [ ! -f "${SERVER_DIR}/docker/wicontent/wi/index" ]; then
# Expand test data if it exists, otherwise try to download it
if [ -f "${SERVER_DIR}/testdata.tar.gz" ]; then
tar -xf "${SERVER_DIR}/testdata.tar.gz" -C "${SERVER_DIR}/docker/wicontent"
mv "${SERVER_DIR}/docker/wicontent/testdata" "${SERVER_DIR}/docker/wicontent/wi"
else
WICONTENT_URL="$(${SERVER_DIR}/docker/config WICONTENT_URL)"
fi
fi
# Run
echo Build: ${BUILD_TYPE}, image: ${IMAGE}:${TAG_VERSION}
${AUTH_PREFIX} docker -- run -it --rm -p 22221:22221 -v "${SERVER_DIR}/docker/entrypoint":/entrypoint -v "$(dirname "${SERVER_DIR}")":/wi ${IMAGE}:${TAG_VERSION} /entrypoint runwis ${DEBUGGER} --build_type ${BUILD_TYPE} --public_ip 127.0.0.1 --public_listen_port 22221 --instance_name "My Instance Name" --image_tag "My Image Tag" --wicontent_url "${WICONTENT_URL}" --args --server_id 50 --server_name "My Server" --server_location "My Office" --server_type "production" --listen_address 0.0.0.0 --listen_port 22221 --stats_address "${LEADERBOARD_ADDRESS_AND_PORT}" --checksync
rm -f "${TEMP_ENTRYPOINT}"
}
run_without_docker() {
# Attempt putting test data in place
if [ ! -f "${SERVER_DIR}/docker/wicontent/wi/index" ]; then
# Expand test data if it exists
if [ -f "${SERVER_DIR}/testdata.tar.gz" ]; then
echo Untaring testdata.tar.gz...
tar -xf "${SERVER_DIR}/testdata.tar.gz" -C "${SERVER_DIR}/docker/wicontent"
mv "${SERVER_DIR}/docker/wicontent/testdata" "${SERVER_DIR}/docker/wicontent/wi"
else
WICONTENT_URL="$(${SERVER_DIR}/docker/config WICONTENT_URL)"
if [ ! -z "${WICONTENT_URL}" ]; then
echo Attempting download of wicontent.tar.gz...
curl -s "${WICONTENT_URL}" -o "${SERVER_DIR}/docker/wicontent/wicontent.tar.gz"
tar -xf "${SERVER_DIR}/docker/wicontent/wicontent.tar.gz" -C "${SERVER_DIR}/docker/wicontent"
fi
fi
fi
if [ ! -f "${SERVER_DIR}/docker/wicontent/wi/index" ]; then
echo "Mission pack info missing ${SERVER_DIR}/docker/wicontent"
exit 1
fi
# Debugger
if [ ! -z "$DEBUGGER" ]; then
DEBUGGER="${DEBUGGER} --args"
@ -81,6 +76,8 @@ else
BUILD_TYPE=debug
fi
prepare_content
if [ "${DOCKER}" == "0" ]; then
run_without_docker
else