amorfo77/docker-minecraft-server
1
0
Fork 0
mirror of https://github.com/itzg/docker-minecraft-server.git synced 2026-03-13 18:21:24 +00:00
Code Issues Projects Releases Wiki Activity

Added log prefixes (#444)

Browse Source
This commit is contained in:
Malcolm Nihlén
2020-03-06 16:52:17 +01:00
committed by GitHub
parent 74df4b6a9c
commit 1e334ca7d5
18 changed files with 172 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
start-finalSetup04ServerProperties
View File

@@ -1,5 +1,7 @@
#!/bin/bash
. /start-utils
# FUNCTIONS
function setServerProp {
local prop=$1
@@ -10,16 +12,16 @@ function setServerProp {
TRUE|FALSE)
var=${var,,} ;;
esac
echo "Setting ${prop} to '${var}' in ${SERVER_PROPERTIES}"
log "Setting ${prop} to '${var}' in ${SERVER_PROPERTIES}"
sed -i "/^${prop}\s*=/ c ${prop}=${var}" "$SERVER_PROPERTIES"
else
echo "Skip setting ${prop}"
log "Skip setting ${prop}"
fi
}
function customizeServerProps {
if [ -n "$WHITELIST" ]; then
echo "Creating whitelist"
log "Creating whitelist"
setServerProp "whitelist" "true"
setServerProp "white-list" "true"
fi
@@ -89,7 +91,7 @@ function customizeServerProps {
DIFFICULTY=3
;;
*)
echo "DIFFICULTY must be peaceful, easy, normal, or hard."
log "DIFFICULTY must be peaceful, easy, normal, or hard."
exit 1
;;
esac
@@ -97,7 +99,7 @@ function customizeServerProps {
fi
if [ -n "$MODE" ]; then
echo "Setting mode"
log "Setting mode"
MODE_LC=$( echo $MODE | tr '[:upper:]' '[:lower:]' )
case $MODE_LC in
0|1|2|3)
@@ -115,7 +117,7 @@ function customizeServerProps {
MODE=3
;;
*)
echo "ERROR: Invalid game mode: $MODE"
log "ERROR: Invalid game mode: $MODE"
exit 1
;;
esac
@@ -126,11 +128,11 @@ function customizeServerProps {
# Deploy server.properties file
if [[ ${TYPE} == "FEED-THE-BEAST" ]]; then
export SERVER_PROPERTIES=${FTB_DIR}/server.properties
echo "detected FTB, changing properties path to ${SERVER_PROPERTIES}"
log "detected FTB, changing properties path to ${SERVER_PROPERTIES}"
fi
if [ ! -e "$SERVER_PROPERTIES" ]; then
echo "Creating server.properties in ${SERVER_PROPERTIES}"
log "Creating server.properties in ${SERVER_PROPERTIES}"
cp /tmp/server.properties "$SERVER_PROPERTIES"
customizeServerProps
elif [ -n "${OVERRIDE_SERVER_PROPERTIES}" ]; then
@@ -139,11 +141,11 @@ elif [ -n "${OVERRIDE_SERVER_PROPERTIES}" ]; then
customizeServerProps
;;
*)
echo "server.properties already created, skipping"
log "server.properties already created, skipping"
;;
esac
else
echo "server.properties already created, skipping"
log "server.properties already created, skipping"
fi
exec /start-finalSetup05EnvVariables $@