amorfo77/docker-minecraft-server
1
0
Fork 0
mirror of https://github.com/itzg/docker-minecraft-server.git synced 2026-04-16 18:48:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into openj9

Browse Source
This commit is contained in:
Geoff Bourne
2019-11-16 09:01:17 -06:00
parent 6ef4e984c7 135bafefeb
commit ca9c280b0b
11 changed files with 177 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
start-minecraftFinalSetup
View File

@@ -2,14 +2,16 @@
. /start-utils
if [ -n "$OPS" -a ! -e ops.txt.converted ]; then
echo "Setting ops"
echo $OPS | awk -v RS=, '{print}' >> ops.txt
if [ -n "$OPS" ]; then
echo "Setting/adding ops"
rm -rf ops.txt.converted
echo $OPS | awk -v RS=, '{print}' > ops.txt
fi
if [ -n "$WHITELIST" -a ! -e white-list.txt.converted ]; then
if [ -n "$WHITELIST" ]; then
echo "Setting whitelist"
echo $WHITELIST | awk -v RS=, '{print}' >> white-list.txt
rm -rf white-list.txt.converted
echo $WHITELIST | awk -v RS=, '{print}' > white-list.txt
fi
if [ -n "$ICON" -a ! -e server-icon.png ]; then
@@ -117,7 +119,7 @@ if [[ ${TYPE} == "FEED-THE-BEAST" ]]; then
cat > "${FTB_DIR}/settings-local.sh" <<EOF
export MIN_RAM="${INIT_MEMORY}"
export MAX_RAM="${MAX_MEMORY}"
export JAVA_PARAMETERS="-Xms${INIT_MEMORY} $expandedDOpts"
export JAVA_PARAMETERS="${JVM_XX_OPTS} -Xms${INIT_MEMORY} ${JVM_OPTS} $expandedDOpts"
EOF
# patch CurseForge cfg file, if present