Upgraded easy-add to 0.7.1

Needed when your machine has multiple ip adresses assigned and you want to host your server on another ip than the default one.

Dockerfile

@@ -15,12 +15,9 @@ RUN apk add --no-cache -U \
   mysql-client \
   tzdata \
   rsync \
-  nano \
-  python python-dev py2-pip
+  nano
 
-RUN pip install mcstatus yq
-
-HEALTHCHECK CMD mcstatus localhost:$SERVER_PORT ping
+HEALTHCHECK --start-period=1m CMD mc-monitor status --host localhost --port $SERVER_PORT
 
 RUN addgroup -g 1000 minecraft \
   && adduser -Ss /bin/false -u 1000 -G minecraft -h /home/minecraft minecraft \
@@ -29,30 +26,41 @@ RUN addgroup -g 1000 minecraft \
 
 EXPOSE 25565 25575
 
-RUN echo 'hosts: files dns' > /etc/nsswitch.conf
+# hook into docker BuildKit --platform support
+# see https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope
+ARG TARGETOS=linux
+ARG TARGETARCH=amd64
+ARG TARGETVARIANT=""
 
-ARG RESTIFY_VER=1.1.6
-ARG RCON_CLI_VER=1.4.6
-ARG MC_SERVER_RUNNER_VER=1.3.2
-ARG ARCH=amd64
+ARG EASY_ADD_VER=0.7.1
+ADD https://github.com/itzg/easy-add/releases/download/${EASY_ADD_VER}/easy-add_${TARGETOS}_${TARGETARCH}${TARGETVARIANT} /usr/bin/easy-add
+RUN chmod +x /usr/bin/easy-add
 
-ADD https://github.com/itzg/restify/releases/download/${RESTIFY_VER}/restify_${RESTIFY_VER}_linux_${ARCH}.tar.gz /tmp/restify.tgz
-RUN tar -x -C /usr/local/bin -f /tmp/restify.tgz restify && \
-  rm /tmp/restify.tgz
+RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
+  --var version=1.2.0 --var app=restify --file {{.app}} \
+  --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
 
-ADD https://github.com/itzg/rcon-cli/releases/download/${RCON_CLI_VER}/rcon-cli_${RCON_CLI_VER}_linux_${ARCH}.tar.gz /tmp/rcon-cli.tgz
-RUN tar -x -C /usr/local/bin -f /tmp/rcon-cli.tgz rcon-cli && \
-  rm /tmp/rcon-cli.tgz
+RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
+ --var version=1.4.7 --var app=rcon-cli --file {{.app}} \
+ --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
 
-ADD https://github.com/itzg/mc-server-runner/releases/download/${MC_SERVER_RUNNER_VER}/mc-server-runner_${MC_SERVER_RUNNER_VER}_linux_${ARCH}.tar.gz /tmp/mc-server-runner.tgz
-RUN tar -x -C /usr/local/bin -f /tmp/mc-server-runner.tgz mc-server-runner && \
-  rm /tmp/mc-server-runner.tgz
+RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
+ --var version=0.1.7 --var app=mc-monitor --file {{.app}} \
+ --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
 
-COPY mcadmin.jq /usr/share
-RUN chmod +x /usr/local/bin/*
+RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
+ --var version=1.3.3 --var app=mc-server-runner --file {{.app}} \
+ --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
+
+RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
+ --var version=0.1.1 --var app=maven-metadata-release --file {{.app}} \
+ --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
+
+COPY mcstatus /usr/local/bin
 
 VOLUME ["/data","/mods","/config"]
 COPY server.properties /tmp/server.properties
+COPY log4j2.xml /tmp/log4j2.xml
 WORKDIR /data
 
 ENTRYPOINT [ "/start" ]

README.md

@@ -2,7 +2,7 @@
 [![Docker Pulls](https://img.shields.io/docker/pulls/itzg/minecraft-server.svg)](https://hub.docker.com/r/itzg/minecraft-server/)
 [![Docker Stars](https://img.shields.io/docker/stars/itzg/minecraft-server.svg?maxAge=2592000)](https://hub.docker.com/r/itzg/minecraft-server/)
 [![GitHub Issues](https://img.shields.io/github/issues-raw/itzg/docker-minecraft-server.svg)](https://github.com/itzg/docker-minecraft-server/issues)
-[![](https://img.shields.io/gitter/room/itzg/dockerfiles.svg?style=flat)](https://gitter.im/itzg/dockerfiles)
+[![Discord](https://img.shields.io/discord/660567679458869252)](https://discord.gg/DXfKpjB)
 [![](https://img.shields.io/badge/Donate-Buy%20me%20a%20coffee-orange.svg)](https://www.buymeacoffee.com/itzg)
 
 This docker image provides a Minecraft Server that will automatically download the latest stable
@@ -106,9 +106,9 @@ and start the server again with `docker start CONTAINERID` to pick up the new co
 
 To use a different Minecraft version, pass the `VERSION` environment variable, which can have the value
 
-* LATEST
+* LATEST (the default)
 * SNAPSHOT
-* (or a specific version, such as "1.7.9")
+* or a specific version, such as "1.7.9"
 
 For example, to use the latest snapshot:
 
@@ -118,6 +118,30 @@ or a specific version:
 
     docker run -d -e VERSION=1.7.9 ...
 
+When using "LATEST" or "SNAPSHOT" an upgrade can be performed by simply restarting the container.
+During the next startup, if a newer version is available from the respective release channel, then
+the new server jar file is downloaded and used. _NOTE: over time you might see older versions of
+the server jar remain in the `/data` directory. It is safe to remove those._
+
+## Running Minecraft server on different Java version
+
+To use a different version of Java, please use a docker tag to run your Minecraft server.
+
+| Tag name | Description | Linux |
+|---------|-------------|-------|
+| latest  | **Default**. Uses Java version 8 update 212 | Alpine Linux |
+| adopt13 | Uses Java version 13 latest update | Alpine Linux |
+| adopt11 | Uses Java version 11 latest update | Alpine Linux |
+| openj9 | Uses Eclipse OpenJ9 JVM | Alpine Linux |
+| openj9-nightly | Uses Eclipse OpenJ9 JVM testing builds | Alpine Linux |
+| multiarch | Uses Java version 8 latest update | Debian Linux |
+
+For example, to use a Java version 13:
+
+    docker run --name mc itzg/minecraft-server:adopt13
+
+Keep in mind that some versions of Minecraft server can't work on the newest versions of Java. Also, FORGE doesn't support openj9 JVM implementation.
+
 ## Healthcheck
 
 This image contains [Dinnerbone's mcstatus](https://github.com/Dinnerbone/mcstatus) and uses
@@ -146,6 +170,17 @@ description: "{u'text': u'A Minecraft Server Powered by Docker'}"
 players: 0/20 No players online
 ```
 
+## Deployment Templates and Examples
+
+### Helm Charts
+
+- [stable/minecraft](https://hub.helm.sh/charts/stable/minecraft) ([chart source](https://github.com/helm/charts/tree/master/stable/minecraft))
+- [mcsh/server-deployment](https://github.com/mcserverhosting-net/charts)
+
+### Examples
+
+The [examples directory](https://github.com/itzg/docker-minecraft-server/tree/master/examples) also provides examples of deploying the [itzg/minecraft-server](https://hub.docker.com/r/itzg/minecraft-server/) Docker image.
+
 ## Running a Forge Server
 
 Enable Forge server mode by adding a `-e TYPE=FORGE` to your command-line.
@@ -240,6 +275,9 @@ There are some limitations to what characters you can use.
 | Name  | `0-9a-zA-Z_-`       |
 | Value | `0-9a-zA-Z_-:/=?.+` |
 
+Variables will be replaced in files with the following extensions:
+`.yml`, `.yaml`, `.txt`, `.cfg`, `.conf`, `.properties`.
+
 Here is a full example where we want to replace values inside a `database.yml`.
 
 ```yml

docker-versions-create.sh

@@ -0,0 +1,98 @@
+#!/bin/bash
+#set -x
+# Use this variable to indicate a list of branches that docker hub is watching
+branches_list=('openj9' 'openj9-nightly' 'adopt11' 'multiarch' 'armv7')
+
+. /start-utils
+
+function TrapExit {
+  log "Checking out back in master"
+  git checkout master
+}
+
+batchMode=false
+
+while getopts "b" arg
+do
+  case $arg in
+    b)
+      batchMode=true
+      ;;
+    *)
+      log "Unsupported arg $arg"
+      exit 2
+      ;;
+  esac
+done
+
+${batchMode} && log "Using batch mode"
+
+trap TrapExit EXIT SIGTERM
+
+test -d ./.git || { log ".git folder was not found. Please start this script from root directory of the project!";
+  exit 1; }
+
+# Making sure we are in master
+git checkout master
+git pull --all || { log "Can't pull the repo!"; \
+  exit 1; }
+
+git_branches=$(git branch -a)
+
+for branch in "${branches_list[@]}"; do
+  if [[ "$git_branches" != *"$branch"* ]]; then
+    log "Can't update $branch because I can't find it in the list of branches."
+    exit 1
+  else
+    log "Branch $branch found. Working with it."
+    git checkout "$branch" || { log "Can't checkout into the branch. Don't know the cause."; \
+      exit 1; }
+    proceed='False'
+    while [[ "$proceed" == "False" ]]; do
+      # Ensure local branch is aligned with remote since docker-versions-create may have been run elsewhere
+      git pull
+
+      if git merge -m 'Auto-merging via docker-versions-create' master; then
+        proceed="True"
+        log "Branch $branch updated to current master successfully"
+        # pushing changes to remote for this branch
+        git commit -m "Auto merge branch with master" -a
+        # push may fail if remote doesn't have this branch yet. In this case - sending branch
+        git push || git push -u origin "$branch" || { log "Can't push changes to the origin."; exit 1; }
+      elif ${batchMode}; then
+        status=$?
+        log "Git merge failed in batch mode"
+        exit ${status}
+        # and trap exit gets us back to master
+      else
+        cat<<EOL
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+Master merge in the branch $branch encountered an error!
+You may try to fix the error and merge again. (Commit changes)
+Or skip this branch merge completely.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+EOL
+        printf "Should we try again? (y):"
+        read -r answer
+        if [[ "$answer" == '' ]] || [[ "$answer" == 'y' ]] || [[ "$answer" == 'Y' ]]; then
+          # If you use non-local editor or files are changed in repo
+          cat <<EOL
+
+The following commands may encounter an error!
+This is completely fine if the changes were made locally and remote branch doesn't know about them.
+
+EOL
+          # Updating branch from remote before trying again
+          git checkout master
+          git fetch --all
+          git pull -a
+          git checkout "$branch"
+          continue
+        else
+          break
+        fi
+      fi
+    done
+  fi
+
+done

examples/README.md

@@ -0,0 +1,3 @@
+# Deployment Examples
+
+This directory contains various deployment examples of the [itzg/minecraft-server](https://hub.docker.com/r/itzg/minecraft-server/) Docker image.

examples/k8s/using-statefulset.yml

@@ -0,0 +1,50 @@
+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  labels:
+    app: example
+  name: example
+spec:
+  replicas: 1
+  serviceName: example
+  selector:
+    matchLabels:
+      app: example
+  template:
+    metadata:
+      labels:
+        app: example
+    spec:
+      containers:
+        - name: mc
+          image: itzg/minecraft-server
+          env:
+            - name: EULA
+              value: "TRUE"
+          volumeMounts:
+            - mountPath: /data
+              name: data
+  volumeClaimTemplates:
+    - metadata:
+        name: data
+      spec:
+        accessModes:
+          - ReadWriteOnce
+        resources:
+          requests:
+            storage: 1Gi
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    service: example
+  name: example
+spec:
+  ports:
+    - port: 25565
+      targetPort: 25565
+  selector:
+    app: example
+  type: LoadBalancer

log4j2.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="WARN" packages="com.mojang.util">
+    <Appenders>
+        <Console name="SysOut" target="SYSTEM_OUT">
+            <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg%n" />
+        </Console>
+        <Queue name="ServerGuiConsole">
+            <PatternLayout pattern="[%d{HH:mm:ss} %level]: %msg%n" />
+        </Queue>
+        <RollingRandomAccessFile name="File" fileName="logs/latest.log" filePattern="logs/%d{yyyy-MM-dd}-%i.log.gz">
+            <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg%n" />
+            <Policies>
+                <TimeBasedTriggeringPolicy />
+                <OnStartupTriggeringPolicy />
+            </Policies>
+            <DefaultRolloverStrategy>
+                <Delete basePath="logs">
+                    <IfFileName glob="*.log.gz" />
+                    <IfLastModified age="7d" />
+                </Delete>
+            </DefaultRolloverStrategy>
+        </RollingRandomAccessFile>
+    </Appenders>
+    <Loggers>
+        <Root level="info">
+            <filters>
+                <MarkerFilter marker="NETWORK_PACKETS" onMatch="DENY" onMismatch="NEUTRAL" />
+            </filters>
+            <AppenderRef ref="SysOut"/>
+            <AppenderRef ref="File"/>
+            <AppenderRef ref="ServerGuiConsole"/>
+        </Root>
+    </Loggers>
+</Configuration>

mcadmin.jq

@@ -1,7 +0,0 @@
-.[] |
- select(.elements | length > 1) |
-  select(.elements[].elements[] | select(.class == "version" and .text == $version)) |
-   .elements[].elements[] |
-    select(.class|contains("server-jar")) |
-     .elements[] | select(.name="a") |
-      .href

mcstatus

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+##### mcstatus shim for mc-monitor
+# handles translating calls to
+#   mcstatus (host:port) (command)
+# where the actual command is ignore, but is typically ping or status
+
+addr="$1"
+
+IFS=':'
+read -a parts <<< "${addr}"
+if [[ ${#parts[*]} -gt 1 ]]; then
+  exec mc-monitor status --host ${parts[0]} --port ${parts[1]}
+else
+  exec mc-monitor status --host ${parts[0]}
+fi

start

@@ -1,22 +1,46 @@
 #!/bin/bash
 
+. /start-utils
+
 umask 0002
 chmod g+w /data
 
 if [ $(id -u) = 0 ]; then
-  if [[ -v UID && $UID != $(id -u) ]]; then
-    usermod -u $UID minecraft
+  runAsUser=minecraft
+  runAsGroup=minecraft
+
+  if [[ -v UID ]]; then
+    if [[ $UID != 0 ]]; then
+      if [[ $UID != $(id -u minecraft) ]]; then
+        log "Changing uid of minecraft to $UID"
+        usermod -u $UID minecraft
+      fi
+    else
+      runAsUser=root
+    fi
   fi
+
   if [[ -v GID ]]; then
-    groupmod -o -g $GID minecraft
+    if [[ $GID != 0 ]]; then
+      if [[ $GID != $(id -g minecraft) ]]; then
+        log "Changing gid of minecraft to $GID"
+        groupmod -o -g $GID minecraft
+      fi
+    else
+      runAsGroup=root
+    fi
   fi
 
   if [[ $(stat -c "%u" /data) != $UID ]]; then
-    echo "Changing ownership of /data to $UID ..."
-    chown -R minecraft:minecraft /data
+    log "Changing ownership of /data to $UID ..."
+    chown -R ${runAsUser}:${runAsGroup} /data
   fi
 
-  exec su-exec minecraft:minecraft /start-configuration $@
+  if [[ ${SKIP_NSSWITCH_CONF^^} != TRUE ]]; then
+    echo 'hosts: files dns' > /etc/nsswitch.conf
+  fi
+
+  exec su-exec ${runAsUser}:${runAsGroup} /start-configuration $@
 else
   exec /start-configuration $@
 fi

start-configuration

@@ -1,33 +1,37 @@
 #!/bin/bash
 
+. /start-utils
+
 shopt -s nullglob
 
 #umask 002
 export HOME=/data
 
 if [ ! -e /data/eula.txt ]; then
-  if [ "$EULA" != "" ]; then
-    echo "# Generated via Docker on $(date)" > eula.txt
-    echo "eula=$EULA" >> eula.txt
-    if [ $? != 0 ]; then
-      echo "ERROR: unable to write eula to /data. Please make sure attached directory is writable by uid=${UID}"
-      exit 2
-    fi
-  else
-    echo ""
-    echo "Please accept the Minecraft EULA at"
-    echo "  https://account.mojang.com/documents/minecraft_eula"
-    echo "by adding the following immediately after 'docker run':"
-    echo "  -e EULA=TRUE"
-    echo ""
+  EULA="${EULA,,}"
+  if [ "$EULA" != "true" ]; then
+    log ""
+    log "Please accept the Minecraft EULA at"
+    log "  https://account.mojang.com/documents/minecraft_eula"
+    log "by adding the following immediately after 'docker run':"
+    log "  -e EULA=TRUE"
+    log ""
     exit 1
   fi
+
+  echo "# Generated via Docker on $(date)" > eula.txt
+  echo "eula=$EULA" >> eula.txt
+  if [ $? != 0 ]; then
+    log "ERROR: unable to write eula to /data. Please make sure attached directory is writable by uid=${UID}"
+    exit 2
+  fi
 fi
 
-echo "Running as uid=$(id -u) gid=$(id -g) with /data as '$(ls -lnd /data)'"
+
+log "Running as uid=$(id -u) gid=$(id -g) with /data as '$(ls -lnd /data)'"
 
 if ! touch /data/.verify_access; then
-  echo "ERROR: /data doesn't seem to be writable. Please make sure attached directory is writable by uid=$(id -u)"
+  log "ERROR: /data doesn't seem to be writable. Please make sure attached directory is writable by uid=$(id -u)"
   exit 2
 fi
 
@@ -36,14 +40,14 @@ rm /data/.verify_access || true
 if [[ $PROXY ]]; then
     export http_proxy="$PROXY"
     export https_proxy="$PROXY"
-    echo "INFO: Giving proxy time to startup..."
+    log "INFO: Giving proxy time to startup..."
     sleep 5
 fi
 
 export SERVER_PROPERTIES=/data/server.properties
 export VERSIONS_JSON=https://launchermeta.mojang.com/mc/game/version_manifest.json
 
-echo "Checking version information."
+log "Checking version information."
 case "X$VERSION" in
   X|XLATEST|Xlatest)
     export VANILLA_VERSION=`curl -fsSL $VERSIONS_JSON | jq -r '.latest.release'`
@@ -63,7 +67,7 @@ cd /data
 
 export ORIGINAL_TYPE=${TYPE^^}
 
-echo "Checking type information."
+log "Checking type information."
 case "${TYPE^^}" in
   *BUKKIT|SPIGOT)
     exec /start-deployBukkitSpigot $@
@@ -98,8 +102,8 @@ case "${TYPE^^}" in
   ;;
 
   *)
-      echo "Invalid type: '$TYPE'"
-      echo "Must be: VANILLA, FORGE, BUKKIT, SPIGOT, PAPER, FTB, CURSEFORGE, SPONGEVANILLA"
+      log "Invalid type: '$TYPE'"
+      log "Must be: VANILLA, FORGE, BUKKIT, SPIGOT, PAPER, FTB, CURSEFORGE, SPONGEVANILLA"
       exit 1
   ;;
 

start-deployBukkitSpigot

@@ -1,24 +1,27 @@
 #!/bin/bash
 
+. /start-utils
+
 set -e
 
 function buildSpigotFromSource {
-  echo "Building Spigot $VANILLA_VERSION from source, might take a while, get some coffee"
+  log "Building Spigot $VANILLA_VERSION from source, might take a while, get some coffee"
   rm -rf /data/temp
   mkdir /data/temp
   cd /data/temp
 
   jvmOpts="-Xms${INIT_MEMORY:-$MEMORY} -Xmx${MAX_MEMORY:-$MEMORY}"
 
+  logn ''
   curl -sSL -o /data/temp/BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar && \
-    java $jvmOpts -jar /data/temp/BuildTools.jar --rev $VANILLA_VERSION 2>&1 |tee /data/spigot_build.log| while read l; do echo -n .; done; echo "done"
+    java $jvmOpts -jar /data/temp/BuildTools.jar --rev $VANILLA_VERSION 2>&1 |tee /data/spigot_build.log| while read l; do echo -n .; done; log "done"
   if ! mv spigot-*.jar /data/spigot_server.jar; then
-    echo "ERR failed to build Spigot"
+    log "ERR failed to build Spigot"
     cat /data/spigot_build.log
     exit 1
   fi
-  mv craftbukkit-*.jar /data/craftbukkit_server.jar
-  echo "Cleaning up"
+  mv craftbukkit-*.jar /data/${SERVER}
+  log "Cleaning up"
   rm -rf /data/temp
   cd /data
 }
@@ -38,18 +41,11 @@ function downloadSpigot {
       ;;
   esac
 
-  local downloadVersion
-  if [[ ${VERSION} == LATEST ]]; then
-    downloadVersion=${VANILLA_VERSION}
-  else
-    downloadVersion=${VERSION}
-  fi
-
   if [[ -z $downloadUrl ]]; then
-    downloadUrl="https://cdn.getbukkit.org/${getbukkitFlavor}/${getbukkitFlavor}-${downloadVersion}.jar"
+    downloadUrl="https://cdn.getbukkit.org/${getbukkitFlavor}/${getbukkitFlavor}-${VANILLA_VERSION}.jar"
   fi
 
-  echo "Downloading $match from $downloadUrl ..."
+  log "Downloading $match from $downloadUrl ..."
   curl -fsSL -o $SERVER "$downloadUrl"
   if [[ $? != 0 || $(grep -c "DOCTYPE html" $SERVER) != 0 ]]; then
     cat <<EOF
@@ -66,10 +62,10 @@ EOF
 
 case "$TYPE" in
   *BUKKIT|*bukkit)
-    export SERVER=craftbukkit_server.jar
+    export SERVER=craftbukkit_server-${VANILLA_VERSION}.jar
     ;;
   *)
-    export SERVER=spigot_server.jar
+    export SERVER=spigot_server-${VANILLA_VERSION}.jar
     ;;
 esac
 

start-deployCustom

@@ -7,21 +7,21 @@ if isURL ${CUSTOM_SERVER}; then
   export SERVER=/data/${filename}
 
   if [[ -f ${SERVER} ]] || [ -n "$FORCE_REDOWNLOAD" ]; then
-    echo "Using previously downloaded jar at ${SERVER}"
+    log "Using previously downloaded jar at ${SERVER}"
   else
-   echo "Downloading custom server jar from ${CUSTOM_SERVER} ..."
+   log "Downloading custom server jar from ${CUSTOM_SERVER} ..."
    if ! curl -sSL -o ${SERVER} ${CUSTOM_SERVER}; then
-      echo "Failed to download from ${CUSTOM_SERVER}"
+      log "Failed to download from ${CUSTOM_SERVER}"
       exit 2
     fi
   fi
 
 elif [[ -f ${CUSTOM_SERVER} ]]; then
-  echo "Using custom server jar at ${CUSTOM_SERVER} ..."
+  log "Using custom server jar at ${CUSTOM_SERVER} ..."
   export SERVER=${CUSTOM_SERVER}
 
 else
-  echo "CUSTOM_SERVER is not properly set to a URL or existing jar file"
+  log "CUSTOM_SERVER is not properly set to a URL or existing jar file"
   exit 2
 fi
 

start-deployFTB

@@ -8,11 +8,11 @@ export TYPE=FEED-THE-BEAST
 
 FTB_SERVER_MOD=${FTB_SERVER_MOD:-$CF_SERVER_MOD}
 
-echo "Looking for Feed-The-Beast / CurseForge server modpack."
+log "Looking for Feed-The-Beast / CurseForge server modpack."
 if [[ -z $FTB_SERVER_MOD ]]; then
-    echo "Environment variable FTB_SERVER_MOD not set."
-    echo "Set FTB_SERVER_MOD to the file name of the FTB server modpack."
-    echo "(And place the modpack in the /data directory.)"
+    log "Environment variable FTB_SERVER_MOD not set."
+    log "Set FTB_SERVER_MOD to the file name of the FTB server modpack."
+    log "(And place the modpack in the /data directory.)"
     exit 2
 fi
 
@@ -21,7 +21,7 @@ entryScriptExpr="-name ServerStart.sh -o -name ServerStartLinux.sh -o -name Laun
 if [[ -d ${FTB_BASE_DIR} ]]; then
   startScriptCount=$(find ${FTB_BASE_DIR} $entryScriptExpr |wc -l)
   if [[ $startScriptCount > 1 ]]; then
-    echo "Conflicting FTB/CurseForge packages have been installed. Please cleanup ${FTB_BASE_DIR}"
+    log "Conflicting FTB/CurseForge packages have been installed. Please cleanup ${FTB_BASE_DIR}"
     exit 2
   fi
 else
@@ -45,7 +45,7 @@ if [[ $startScriptCount = 0 ]]; then
       file=$(basename $(dirname $srv_modpack))
       downloaded=/data/${file}.zip
       if [ ! -e $downloaded ]; then
-        echo "Downloading FTB modpack...
+        log "Downloading FTB modpack...
   $srv_modpack -> $downloaded"
         curl -sSL -o $downloaded $srv_modpack
       fi
@@ -60,16 +60,16 @@ if [[ $startScriptCount = 0 ]]; then
       srv_modpack=/data/${srv_modpack}
   fi
   if [[ ! -f ${srv_modpack} ]]; then
-      echo "FTB server modpack ${srv_modpack} not found."
+      log "FTB server modpack ${srv_modpack} not found."
       exit 2
   fi
   if [[ ! ${srv_modpack: -4} == ".zip" ]]; then
-      echo "FTB server modpack ${srv_modpack} is not a zip archive."
-      echo "Please set FTB_SERVER_MOD to a file with a .zip extension."
+      log "FTB server modpack ${srv_modpack} is not a zip archive."
+      log "Please set FTB_SERVER_MOD to a file with a .zip extension."
       exit 2
   fi
 
-  echo "Unpacking FTB server modpack ${srv_modpack} ..."
+  log "Unpacking FTB server modpack ${srv_modpack} ..."
   mkdir -p ${FTB_BASE_DIR}
   unzip -o ${srv_modpack} -d ${FTB_BASE_DIR} | awk '{printf "."} END {print ""}'
 fi
@@ -79,7 +79,7 @@ if [[ $(find ${FTB_BASE_DIR} $entryScriptExpr | wc -l) = 0 ]]; then
     forgeJar=$(find ${FTB_BASE_DIR} -name 'forge*.jar' -a -not -name 'forge*installer')
     if [[ "$forgeJar" ]]; then
       export FTB_BASE_DIR=$(dirname "${forgeJar}")
-      echo "No entry script found, so building one for ${forgeJar}"
+      log "No entry script found, so building one for ${forgeJar}"
       cat > "${FTB_BASE_DIR}/ServerStart.sh" <<EOF
 #!/bin/sh
 . ./settings-local.sh
@@ -87,18 +87,18 @@ java \${JAVA_PARAMETERS} -Xmx\${MAX_RAM} -jar $(basename "${forgeJar}") nogui
 EOF
       chmod +x "${FTB_BASE_DIR}/ServerStart.sh"
     else
-      echo "Please make sure you are using the server version of the FTB modpack!"
+      log "Please make sure you are using the server version of the FTB modpack!"
       exit 2
     fi
 fi
 
 scriptCount=$(find "${FTB_BASE_DIR}" $entryScriptExpr | wc -l)
 if [[ $scriptCount = 0 ]]; then
-    echo "Please make sure you are using the server version of the FTB modpack!"
+    log "Please make sure you are using the server version of the FTB modpack!"
     exit 2
 elif [[ $scriptCount > 1 ]]; then
-    echo "Ambigous startup scripts in FTB modpack!"
-    echo "found:"
+    log "Ambigous startup scripts in FTB modpack!"
+    log "found:"
     find ${FTB_BASE_DIR} $entryScriptExpr
     exit 2
 fi
@@ -112,7 +112,7 @@ sed -i 's/.*read.*Restart now/#\0/' "${FTB_SERVER_START}"
 legacyJavaFixerPath="${FTB_DIR}/mods/legacyjavafixer.jar"
 
 if isTrue ${FTB_LEGACYJAVAFIXER} && [ ! -e "${legacyJavaFixerPath}" ]; then
-  echo "Installing legacy java fixer to ${legacyJavaFixerPath}"
+  log "Installing legacy java fixer to ${legacyJavaFixerPath}"
   curl -sSL -o "${legacyJavaFixerPath}" ${legacyJavaFixerUrl}
 fi
 

start-deployFabric

@@ -1,5 +1,7 @@
 #!/bin/bash
-set -u
+set -eu
+
+. /start-utils
 
 export TYPE=FABRIC
 
@@ -7,11 +9,10 @@ FABRIC_INSTALLER=${FABRIC_INSTALLER:-}
 FABRIC_INSTALLER_URL=${FABRIC_INSTALLER_URL:-}
 FABRICVERSION=${FABRICVERSION:-LATEST}
 if [[ -z $FABRIC_INSTALLER && -z $FABRIC_INSTALLER_URL ]]; then
-  echo "Checking Fabric version information."
+  log "Checking Fabric version information."
   case $FABRICVERSION in
     LATEST)
-      curl -fsSL https://maven.fabricmc.net/net/fabricmc/fabric-installer/maven-metadata.xml | xq -c . > /tmp/fabric.json
-      FABRIC_VERSION=$(< /tmp/fabric.json jq -r ".metadata.versioning.release")
+      FABRIC_VERSION=$(maven-metadata-release https://maven.fabricmc.net/net/fabricmc/fabric-installer/maven-metadata.xml)
       ;;
 
     *)
@@ -24,29 +25,34 @@ if [[ -z $FABRIC_INSTALLER && -z $FABRIC_INSTALLER_URL ]]; then
 elif [[ -z $FABRIC_INSTALLER ]]; then
   FABRIC_INSTALLER="/tmp/fabric-installer.jar"
 elif [[ ! -e $FABRIC_INSTALLER ]]; then
-  echo "ERROR: the given Fabric installer doesn't exist : $FABRIC_INSTALLER"
+  log "ERROR: the given Fabric installer doesn't exist : $FABRIC_INSTALLER"
   exit 2
 fi
 
-installMarker=".fabric-installed-${FABRIC_VERSION:-manual}"
+installMarker=".fabric-installed-${VANILLA_VERSION}-${FABRIC_VERSION:-manual}"
 
+debug Checking for installMarker ${installMarker}
 if [[ ! -e $installMarker ]]; then
   if [[ ! -e $FABRIC_INSTALLER ]]; then
     if [[ -z $FABRIC_INSTALLER_URL ]]; then
-      echo "Downloading $FABRIC_VERSION"
+      log "Downloading $FABRIC_VERSION"
       downloadUrl="https://maven.fabricmc.net/net/fabricmc/fabric-installer/$FABRIC_VERSION/fabric-installer-$FABRIC_VERSION.jar"
-      echo "...trying $downloadUrl"
+      log "...trying $downloadUrl"
       curl -o $FABRIC_INSTALLER -fsSL $downloadUrl
     else
-      echo "Downloading $FABRIC_INSTALLER_URL ..."
+      log "Downloading $FABRIC_INSTALLER_URL ..."
       if ! curl -o $FABRIC_INSTALLER -fsSL $FABRIC_INSTALLER_URL; then
-        echo "Failed to download from given location $FABRIC_INSTALLER_URL"
+        log "Failed to download from given location $FABRIC_INSTALLER_URL"
         exit 2
       fi
     fi
   fi
 
-  echo "Installing Fabric $FABRIC_VERSION using $FABRIC_INSTALLER"
+  if isDebugging; then
+    debug "Installing Fabric $FABRIC_VERSION using $FABRIC_INSTALLER with mcversion ${VANILLA_VERSION}"
+  else
+    log "Installing Fabric $FABRIC_VERSION using $FABRIC_INSTALLER"
+  fi
   tries=3
   set +e
   while ((--tries >= 0)); do
@@ -57,11 +63,11 @@ if [[ ! -e $installMarker ]]; then
   done
   set -e
   if (($tries < 0)); then
-    echo "Fabric failed to install after several tries." >&2
+    log "Fabric failed to install after several tries." >&2
     exit 10
   fi
   export SERVER=fabric-server-launch.jar
-  echo "Using server $SERVER"
+  log "Using server $SERVER"
   echo $SERVER > $installMarker
 
 else

start-deployForge

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+. /start-utils
+
 export TYPE=FORGE
 
 if [[ -z $FORGE_INSTALLER && -z $FORGE_INSTALLER_URL ]]; then
@@ -14,7 +16,7 @@ if [[ -z $FORGE_INSTALLER && -z $FORGE_INSTALLER_URL ]]; then
 
   #################################################################################
 
-  echo "Checking Forge version information."
+  log "Checking Forge version information."
   case $FORGEVERSION in
     RECOMMENDED)
       curl -fsSL -o /tmp/forge.json http://files.minecraftforge.net/maven/net/minecraftforge/forge/promotions_slim.json
@@ -22,8 +24,8 @@ if [[ -z $FORGE_INSTALLER && -z $FORGE_INSTALLER_URL ]]; then
       if [ $FORGE_VERSION = null ]; then
         FORGE_VERSION=$(cat /tmp/forge.json | jq -r ".promos[\"$VANILLA_VERSION-latest\"]")
         if [ $FORGE_VERSION = null ]; then
-          echo "ERROR: Version $VANILLA_VERSION is not supported by Forge"
-          echo "       Refer to http://files.minecraftforge.net/ for supported versions"
+          log "ERROR: Version $VANILLA_VERSION is not supported by Forge"
+          log "       Refer to http://files.minecraftforge.net/ for supported versions"
           exit 2
         fi
       fi
@@ -41,7 +43,7 @@ if [[ -z $FORGE_INSTALLER && -z $FORGE_INSTALLER_URL ]]; then
 elif [[ -z $FORGE_INSTALLER ]]; then
   FORGE_INSTALLER="/tmp/forge-installer.jar"
 elif [[ ! -e $FORGE_INSTALLER ]]; then
-  echo "ERROR: the given Forge installer doesn't exist : $FORGE_INSTALLER"
+  log "ERROR: the given Forge installer doesn't exist : $FORGE_INSTALLER"
   exit 2
 fi
 
@@ -51,7 +53,7 @@ if [ ! -e $installMarker ]; then
   if [ ! -e $FORGE_INSTALLER ]; then
 
     if [[ -z $FORGE_INSTALLER_URL ]]; then
-      echo "Downloading $normForgeVersion"
+      log "Downloading $normForgeVersion"
 
       forgeFileNames="
       $normForgeVersion/forge-$normForgeVersion-installer.jar
@@ -60,25 +62,25 @@ if [ ! -e $installMarker ]; then
     "
       for fn in $forgeFileNames; do
         if [ $fn == END ]; then
-          echo "Unable to compute URL for $normForgeVersion"
+          log "Unable to compute URL for $normForgeVersion"
           exit 2
         fi
         downloadUrl=http://files.minecraftforge.net/maven/net/minecraftforge/forge/$fn
-        echo "...trying $downloadUrl"
+        log "...trying $downloadUrl"
         if curl -o $FORGE_INSTALLER -fsSL $downloadUrl; then
           break
         fi
       done
     else
-      echo "Downloading $FORGE_INSTALLER_URL ..."
+      log "Downloading $FORGE_INSTALLER_URL ..."
       if ! curl -o $FORGE_INSTALLER -fsSL $FORGE_INSTALLER_URL; then
-        echo "Failed to download from given location $FORGE_INSTALLER_URL"
+        log "Failed to download from given location $FORGE_INSTALLER_URL"
         exit 2
       fi
     fi
   fi
 
-  echo "Installing Forge $shortForgeVersion using $FORGE_INSTALLER"
+  log "Installing Forge $shortForgeVersion using $FORGE_INSTALLER"
   mkdir -p mods
   tries=3
   while ((--tries >= 0)); do
@@ -88,22 +90,22 @@ if [ ! -e $installMarker ]; then
     fi
   done
   if (($tries < 0)); then
-    echo "Forge failed to install after several tries." >&2
+    log "Forge failed to install after several tries." >&2
     exit 10
   fi
   # NOTE $shortForgeVersion will be empty if installer location was given to us
-  echo "Finding installed server jar..."
+  log "Finding installed server jar..."
   unset -v latest
   for file in *forge*.jar; do
     [[ $file =~ installer ]] || [[ $file -nt $latest ]] && latest=$file
   done
   if [[ -z $latest ]]; then
-    echo "Unable to derive server jar for Forge"
+    log "Unable to derive server jar for Forge"
     exit 2
   fi
 
   export SERVER=$latest
-  echo "Using server $SERVER"
+  log "Using server $SERVER"
   echo $SERVER > $installMarker
 
 else

start-deployPaper

@@ -1,12 +1,14 @@
 #!/bin/bash
 
-export SERVER=paper_server.jar
-if [ ! -f $SERVER ] || [ -n "$FORCE_REDOWNLOAD" ]; then
+. /start-utils
+
+export SERVER=paper_server-${VANILLA_VERSION}.jar
+if [ ! -f "$SERVER" ] || [ -n "$FORCE_REDOWNLOAD" ]; then
     downloadUrl=${PAPER_DOWNLOAD_URL:-https://papermc.io/api/v1/paper/${VANILLA_VERSION}/latest/download}
-    echo "Downloading Paper $VANILLA_VERSION from $downloadUrl ..."
-    curl -fsSL -o $SERVER "$downloadUrl"
-    if [ ! -f $SERVER ]; then
-      echo "ERROR: failed to download from $downloadUrl (status=$?)"
+    log "Downloading Paper $VANILLA_VERSION from $downloadUrl ..."
+    curl -fsSL -o "$SERVER" "$downloadUrl"
+    if [ ! -f "$SERVER" ]; then
+      log "ERROR: failed to download from $downloadUrl (status=$?)"
       exit 3
     fi
 fi

start-deploySpongeVanilla

@@ -1,9 +1,11 @@
 #!/bin/bash
 
+. /start-utils
+
 export TYPE=spongevanilla
 
 # Parse branch
-echo "Choosing branch for Sponge"
+log "Choosing branch for Sponge"
 case "$SPONGEBRANCH" in
 
   EXPERIMENTAL|experimental|BLEEDING|bleeding)
@@ -18,7 +20,7 @@ esac
 
 # If not SPONGEVERSION selected, detect last version on selected branch
 if [ -z $SPONGEVERSION ]; then
-  echo "Choosing Version for Sponge"
+  log "Choosing Version for Sponge"
   if [ "$SPONGEBRANCH" == "stable" ]; then
     export SPONGEVERSION=`curl -fsSL https://dl-api.spongepowered.org/v1/org.spongepowered/$TYPE | jq -r '.buildTypes.stable.latest.version'`
   else
@@ -29,7 +31,7 @@ fi
 export SERVER="spongevanilla-$SPONGEVERSION.jar"
 
 if [ ! -e $SERVER ] || [ -n "$FORCE_REDOWNLOAD" ]; then
-  echo "Downloading $SERVER ..."
+  log "Downloading $SERVER ..."
   curl -sSL -o $SERVER https://repo.spongepowered.org/maven/org/spongepowered/$TYPE/$SPONGEVERSION/$SERVER
 fi
 

start-deployVanilla

@@ -6,16 +6,16 @@ set -o pipefail
 export SERVER="minecraft_server.${VANILLA_VERSION// /_}.jar"
 
 if [ ! -e $SERVER ] || [ -n "$FORCE_REDOWNLOAD" ]; then
-  echo "Downloading $SERVER ..."
+  log "Downloading $SERVER ..."
   debug "Finding version manifest for $VANILLA_VERSION"
   versionManifestUrl=$(curl -fsSL 'https://launchermeta.mojang.com/mc/game/version_manifest.json' | jq --arg VANILLA_VERSION "$VANILLA_VERSION" --raw-output '[.versions[]|select(.id == $VANILLA_VERSION)][0].url')
   result=$?
   if [ $result != 0 ]; then
-    echo "ERROR failed to obtain version manifest URL ($result)"
+    log "ERROR failed to obtain version manifest URL ($result)"
     exit 1
   fi
   if [ $versionManifestUrl = "null" ]; then
-    echo "ERROR couldn't find a matching manifest entry for $VANILLA_VERSION"
+    log "ERROR couldn't find a matching manifest entry for $VANILLA_VERSION"
     exit 1
   fi
   debug "Found version manifest at $versionManifestUrl"
@@ -23,7 +23,7 @@ if [ ! -e $SERVER ] || [ -n "$FORCE_REDOWNLOAD" ]; then
   serverDownloadUrl=$(curl -fsSL ${versionManifestUrl} | jq --raw-output '.downloads.server.url')
   result=$?
   if [ $result != 0 ]; then
-    echo "ERROR failed to obtain version manifest from $versionManifestUrl ($result)"
+    log "ERROR failed to obtain version manifest from $versionManifestUrl ($result)"
     exit 1
   fi
 
@@ -34,7 +34,7 @@ if [ ! -e $SERVER ] || [ -n "$FORCE_REDOWNLOAD" ]; then
   curl $verbose -fsSL -o $SERVER $serverDownloadUrl
   result=$?
   if [ $result != 0 ]; then
-    echo "ERROR failed to download server from $serverDownloadUrl ($result)"
+    log "ERROR failed to download server from $serverDownloadUrl ($result)"
     exit 1
   fi
 fi

start-finalSetup01World

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+. /start-utils
+
 if [ $TYPE = "FEED-THE-BEAST" ]; then
   worldDest=$FTB_BASE_DIR/$LEVEL
 else
@@ -10,24 +12,24 @@ fi
 if [[ "$WORLD" ]] && [ ! -d "$worldDest" ]; then
 case "X$WORLD" in
   X[Hh][Tt][Tt][Pp]*)
-    echo "Downloading world from $WORLD"
+    log "Downloading world from $WORLD"
     curl -sSL -o - "$WORLD" > /data/world.zip
-    echo "Unzipping world"
+    log "Unzipping world"
     unzip -o -q /data/world.zip
     rm -f /data/world.zip
     if [ ! -d $worldDest ]; then
-      echo World directory not found
+      log World directory not found
       for i in /data/*/level.dat; do
         if [ -f "$i" ]; then
           d=`dirname "$i"`
-          echo Renaming world directory from $d
+          log Renaming world directory from $d
           mv -f "$d" $worldDest
         fi
       done
     fi
     if [ "$TYPE" = "SPIGOT" ]; then
       # Reorganise if a Spigot server
-      echo "Moving End and Nether maps to Spigot location"
+      log "Moving End and Nether maps to Spigot location"
       [ -d "$worldDest/DIM1" ] && mv -f "$worldDest/DIM1" "/data/${LEVEL}_the_end"
       [ -d "$worldDest/DIM-1" ] && mv -f "$worldDest/DIM-1" "/data/${LEVEL}_nether"
     fi
@@ -35,13 +37,13 @@ case "X$WORLD" in
   *)
     if [[ -d $WORLD ]]; then
       if [[ ! -d $worldDest ]]; then
-        echo "Cloning world directory from $WORLD ..."
+        log "Cloning world directory from $WORLD ..."
         cp -r $WORLD $worldDest
       else
-        echo "Skipping clone from $WORLD since $worldDest exists"
+        log "Skipping clone from $WORLD since $worldDest exists"
       fi
     else
-      echo "Invalid URL given for world: Must be HTTP or HTTPS and a ZIP file"
+      log "Invalid URL given for world: Must be HTTP or HTTPS and a ZIP file"
     fi
     ;;
 esac

start-finalSetup02Modpack

@@ -1,5 +1,9 @@
 #!/bin/bash
 
+set -e
+
+. /start-utils
+
 #  CURSE_URL_BASE used in manifest downloads below
 CURSE_URL_BASE=${CURSE_URL_BASE:-https://minecraft.curseforge.com/projects}
 
@@ -17,28 +21,28 @@ if [[ "$MODPACK" ]]; then
 EFFECTIVE_MODPACK_URL=$(curl -Ls -o /dev/null -w %{url_effective} $MODPACK)
 case "X$EFFECTIVE_MODPACK_URL" in
   X[Hh][Tt][Tt][Pp]*.zip)
-    echo "Downloading mod/plugin pack via HTTP"
-    echo "  from $EFFECTIVE_MODPACK_URL ..."
+    log "Downloading mod/plugin pack via HTTP"
+    log "  from $EFFECTIVE_MODPACK_URL ..."
     if ! curl -sSL -o /tmp/modpack.zip "$EFFECTIVE_MODPACK_URL"; then
-      echo "ERROR: failed to download from $EFFECTIVE_MODPACK_URL"
+      log "ERROR: failed to download from $EFFECTIVE_MODPACK_URL"
       exit 2
     fi
 
     if [ "$TYPE" = "SPIGOT" ]; then
       mkdir -p /data/plugins
       if ! unzip -o -d /data/plugins /tmp/modpack.zip; then
-        echo "ERROR: failed to unzip the modpack from $EFFECTIVE_MODPACK_URL"
+        log "ERROR: failed to unzip the modpack from $EFFECTIVE_MODPACK_URL"
       fi
     else
       mkdir -p /data/mods
       if ! unzip -o -d /data/mods /tmp/modpack.zip; then
-        echo "ERROR: failed to unzip the modpack from $EFFECTIVE_MODPACK_URL"
+        log "ERROR: failed to unzip the modpack from $EFFECTIVE_MODPACK_URL"
       fi
     fi
     rm -f /tmp/modpack.zip
     ;;
   *)
-    echo "Invalid URL given for modpack: Must be HTTP or HTTPS and a ZIP file"
+    log "Invalid URL given for modpack: Must be HTTP or HTTPS and a ZIP file"
     ;;
 esac
 fi
@@ -50,10 +54,10 @@ do
   EFFECTIVE_MOD_URL=$(curl -Ls -o /dev/null -w %{url_effective} $i)
   case "X$EFFECTIVE_MOD_URL" in
     X[Hh][Tt][Tt][Pp]*.jar)
-      echo "Downloading mod/plugin via HTTP"
-      echo "  from $EFFECTIVE_MOD_URL ..."
+      log "Downloading mod/plugin via HTTP"
+      log "  from $EFFECTIVE_MOD_URL ..."
       if ! curl -sSL -o /tmp/${EFFECTIVE_MOD_URL##*/} $EFFECTIVE_MOD_URL; then
-        echo "ERROR: failed to download from $EFFECTIVE_MOD_URL to /tmp/${EFFECTIVE_MOD_URL##*/}"
+        log "ERROR: failed to download from $EFFECTIVE_MOD_URL to /tmp/${EFFECTIVE_MOD_URL##*/}"
         exit 2
       fi
 
@@ -67,43 +71,74 @@ do
       rm -f /tmp/${EFFECTIVE_MOD_URL##*/}
       ;;
     *)
-      echo "Invalid URL given for modpack: Must be HTTP or HTTPS and a JAR file"
+      log "Invalid URL given for modpack: Must be HTTP or HTTPS and a JAR file"
       ;;
   esac
 done
 fi
 
 if [[ "$MANIFEST" ]]; then
-EFFECTIVE_MANIFEST_URL=$(curl -Ls -o /dev/null -w %{url_effective} $MANIFEST)
-case "X$EFFECTIVE_MANIFEST_URL" in
+    if [[ -e "$MANIFEST" ]]; then
+        EFFECTIVE_MANIFEST_FILE=$MANIFEST
+    elif isURL "$MANIFEST"; then
+        EFFECTIVE_MANIFEST_FILE=/tmp/manifest.json
+        EFFECTIVE_MANIFEST_URL=$(curl -Ls -o /dev/null -w %{url_effective} $MANIFEST)
+        curl -Ls -o $EFFECTIVE_MANIFEST_FILE "$EFFECTIVE_MANIFEST_URL"
+    else
+        log "MANIFEST='$MANIFEST' is not a valid manifest url or location"
+        exit 2
+    fi
+
+case "X$EFFECTIVE_MANIFEST_FILE" in
   X*.json)
-    if [ -f "${EFFECTIVE_MANIFEST_URL}" ]; then
+    if [ -f "${EFFECTIVE_MANIFEST_FILE}" ]; then
       MOD_DIR=${FTB_BASE_DIR:-/data}/mods
       if [ ! -d "$MOD_DIR" ]
       then
-        echo "Creating mods dir $MOD_DIR"
+        log "Creating mods dir $MOD_DIR"
         mkdir -p "$MOD_DIR"
       fi
-      echo "Starting manifest download..."
-      cat "${EFFECTIVE_MANIFEST_URL}" | jq -r '.files[] | (.projectID|tostring) + " " + (.fileID|tostring)'| while read -r p f
+      log "Starting manifest download..."
+      cat "${EFFECTIVE_MANIFEST_FILE}" | jq -r '.files[] | (.projectID|tostring) + " " + (.fileID|tostring)'| while read -r p f
       do
         if [ ! -f $MOD_DIR/${p}_${f}.jar ]
         then
           redirect_url="$(curl -Ls -o /dev/null -w %{url_effective} ${CURSE_URL_BASE}/${p})"
           url="$redirect_url/download/${f}/file"
-          echo Downloading curseforge mod $url
+          log Downloading curseforge mod $url
           #  Manifest usually doesn't have mod names. Using id should be fine, tho
           curl -sSL "${url}" -o $MOD_DIR/${p}_${f}.jar
         fi
       done
     else
-      echo "Could not find manifest file, unsufficient privs, or malformed path."
+      log "Could not find manifest file, unsufficient privs, or malformed path."
     fi
     ;;
   *)
-    echo "Invalid manifest file for modpack. Please make sure it is a .json file."
+    log "Invalid manifest file for modpack. Please make sure it is a .json file."
     ;;
 esac
 fi
 
+if [[ "${GENERIC_PACK}" ]]; then
+  if isURL "${GENERIC_PACK}"; then
+    generic_pack_url=${GENERIC_PACK}
+    GENERIC_PACK=/tmp/$(basename ${generic_pack_url})
+    log "Downloading generic pack from ${generic_pack_url} ..."
+    curl -fsSL -o ${GENERIC_PACK} ${generic_pack_url}
+  fi
+
+  sum_file=/data/.generic_pack.sum
+  if ! sha256sum -c ${sum_file} -s 2> /dev/null; then
+    base_dir=/tmp/generic_pack_base
+    mkdir -p ${base_dir}
+    unzip -q -d ${base_dir} ${GENERIC_PACK}
+    depth=$(( ${GENERIC_PACK_STRIP_DIRS:-1} + 1 ))
+    log "Applying generic pack, stripping $(( depth - 1 )) level ..."
+    find ${base_dir} -type d -mindepth $depth -maxdepth $depth -exec cp -r {} /data/ +
+    rm -rf ${base_dir}
+    sha256sum ${GENERIC_PACK} > ${sum_file}
+  fi
+fi
+
 exec /start-finalSetup03Modconfig $@

start-finalSetup03Modconfig

@@ -1,11 +1,13 @@
 #!/bin/bash
 
+. /start-utils
+
 # If supplied with a URL for a config (simple zip of configurations), download it and unpack
 if [[ "$MODCONFIG" ]]; then
 case "X$MODCONFIG" in
   X[Hh][Tt][Tt][Pp]*[Zz][iI][pP])
-    echo "Downloading mod/plugin configs via HTTP"
-    echo "  from $MODCONFIG ..."
+    log "Downloading mod/plugin configs via HTTP"
+    log "  from $MODCONFIG ..."
     curl -sSL -o /tmp/modconfig.zip "$MODCONFIG"
     if [ "$TYPE" = "SPIGOT" ]; then
       mkdir -p /data/plugins
@@ -17,7 +19,7 @@ case "X$MODCONFIG" in
     rm -f /tmp/modconfig.zip
     ;;
   *)
-    echo "Invalid URL given for modconfig: Must be HTTP or HTTPS and a ZIP file"
+    log "Invalid URL given for modconfig: Must be HTTP or HTTPS and a ZIP file"
     ;;
 esac
 fi

start-finalSetup04ServerProperties

@@ -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
@@ -41,6 +43,7 @@ function customizeServerProps {
   fi
 
   setServerProp "server-name" "$SERVER_NAME"
+  setServerProp "server-ip" "$SERVER_IP"
   setServerProp "server-port" "$SERVER_PORT"
   setServerProp "motd" "$MOTD"
   setServerProp "allow-nether" "$ALLOW_NETHER"
@@ -89,7 +92,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 +100,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 +118,7 @@ function customizeServerProps {
         MODE=3
         ;;
       *)
-        echo "ERROR: Invalid game mode: $MODE"
+        log "ERROR: Invalid game mode: $MODE"
         exit 1
         ;;
     esac
@@ -126,11 +129,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 +142,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 $@

start-finalSetup05EnvVariables

@@ -1,13 +1,20 @@
 #!/bin/bash
 
-if [ "$REPLACE_ENV_VARIABLES" = "TRUE" ]; then
-  echo "Replacing env variables in configs that match the prefix $ENV_VARIABLE_PREFIX..."
+. /start-utils
+
+if [ "${REPLACE_ENV_VARIABLES^^}" = "TRUE" ]; then
+  log "Replacing env variables in configs that match the prefix $ENV_VARIABLE_PREFIX..."
   while IFS='=' read -r name value ; do
     # check if name of env variable matches the prefix
     # sanity check environment variables to avoid code injections
-    if [[ "$name" = $ENV_VARIABLE_PREFIX* ]] && [[ $value =~ ^[0-9a-zA-Z_:/=?.+\-]*$ ]] && [[ $name =~ ^[0-9a-zA-Z_\-]*$ ]]; then
-        echo "Replacing $name with $value ..."
-        find /data/ -type f \( -name "*.yml" -or -name "*.yaml" -or -name "*.txt" -or -name "*.cfg" -or -name "*.properties" \) -exec sed -i 's#${'"$name"'}#'"$value"'#g' {} \;
+    if [[ "$name" = $ENV_VARIABLE_PREFIX* ]] \
+        && [[ $value =~ ^[0-9a-zA-Z_:/=?.+\-]*$ ]] \
+        && [[ $name =~ ^[0-9a-zA-Z_\-]*$ ]]; then
+      log "Replacing $name with $value ..."
+      find /data/ -type f \
+          \( -name "*.yml" -or -name "*.yaml" -or -name "*.txt" -or -name "*.cfg" \
+          -or -name "*.conf" -or -name "*.properties" \) \
+          -exec sed -i 's#${'"$name"'}#'"$value"'#g' {} \;
     fi
   done < <(env)
 fi

start-minecraftFinalSetup

@@ -3,35 +3,46 @@
 . /start-utils
 
 if [ -n "$OPS" ]; then
-  echo "Setting/adding ops"
+  log "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
-  echo "Setting whitelist"
-  echo $WHITELIST | awk -v RS=, '{print}' >> white-list.txt
+if [ -n "$WHITELIST" ]; then
+  log "Setting whitelist"
+  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
-  echo "Using server icon from $ICON..."
+  log "Using server icon from $ICON..."
   # Not sure what it is yet...call it "img"
   curl -sSL -o /tmp/icon.img $ICON
   specs=$(identify /tmp/icon.img | awk '{print $2,$3}')
   if [ "$specs" = "PNG 64x64" ]; then
     mv /tmp/icon.img /data/server-icon.png
   else
-    echo "Converting image to 64x64 PNG..."
+    log "Converting image to 64x64 PNG..."
     convert /tmp/icon.img -resize 64x64! /data/server-icon.png
   fi
 fi
 
+# Set up log configuration
+LOGFILE="/data/log4j2.xml"
+if [ ! -e "$LOGFILE" ]; then
+  log "Creating log4j2.xml in ${LOGFILE}"
+  cp /tmp/log4j2.xml "$LOGFILE"
+else
+  log "log4j2.xml already created, skipping"
+fi
+JVM_OPTS="-Dlog4j.configurationFile=/data/log4j2.xml ${JVM_OPTS}"
+
 # Make sure files exist and are valid JSON (for pre-1.12 to 1.12 upgrades)
-echo "Checking for JSON files."
+log "Checking for JSON files."
 JSON_FILES=$(find . -maxdepth 1 -name '*.json')
 for j in $JSON_FILES; do
-  if [[ $(python -c "print open('$j').read().strip()==''") = True ]]; then
-    echo "Fixing JSON $j"
+  if [[ $(cat $j | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') == "" ]]; then
+    log "Fixing JSON $j"
     echo '[]' > $j
   fi
 done
@@ -40,7 +51,7 @@ done
 # If any modules have been provided, copy them over
 mkdir -p /data/mods
 if [ -d /mods ]; then
-  echo "Copying any mods over..."
+  log "Copying any mods over..."
   rsync -a --out-format="update:%f:Last Modified %M" --prune-empty-dirs --update /mods /data
 fi
 
@@ -48,7 +59,7 @@ fi
 for c in /config/*
 do
   if [ -f "$c" ]; then
-    echo Copying configuration `basename "$c"`
+    log Copying configuration `basename "$c"`
     cp -rf "$c" /data/config
   fi
 done
@@ -56,7 +67,7 @@ done
 mkdir -p /data/plugins
 if [ "$TYPE" = "SPIGOT" ]; then
   if [ -d /plugins ]; then
-    echo "Copying any Bukkit plugins over..."
+    log "Copying any Bukkit plugins over..."
     # Copy plugins over using rsync to allow deeply nested updates of plugins
     # only updates files if the source file is newer and print updated files
     rsync -a --out-format="update:%f:Last Modified %M" --prune-empty-dirs --update /plugins /data
@@ -75,7 +86,7 @@ if [[ ${GUI} = false || ${GUI} = FALSE ]]; then
 fi
 
 # put these prior JVM_OPTS at the end to give any memory settings there higher precedence
-echo "Setting initial memory to ${INIT_MEMORY:=${MEMORY}} and max to ${MAX_MEMORY:=${MEMORY}}"
+log "Setting initial memory to ${INIT_MEMORY:=${MEMORY}} and max to ${MAX_MEMORY:=${MEMORY}}"
 
 expandedDOpts=
 if [ -n "$JVM_DD_OPTS" ]; then
@@ -101,7 +112,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
@@ -110,7 +121,7 @@ EOF
     fi
 
     cd "${FTB_DIR}"
-    echo "Running FTB ${FTB_SERVER_START} in ${FTB_DIR} ..."
+    log "Running FTB ${FTB_SERVER_START} in ${FTB_DIR} ..."
     if isTrue ${DEBUG_EXEC}; then
       set -x
     fi
@@ -121,7 +132,7 @@ else
     bootstrapArgs="--bootstrap /data/bootstrap.txt"
   fi
 
-  echo "Starting the Minecraft server..."
+  log "Starting the Minecraft server..."
   JVM_OPTS="-Xms${INIT_MEMORY} -Xmx${MAX_MEMORY} ${JVM_OPTS}"
   if isTrue ${DEBUG_EXEC}; then
     set -x

start-utils

@@ -3,7 +3,7 @@
 function isURL {
   local value=$1
 
-  if [[ ${value:0:8} == "https://" || ${value:0:7} = "http://" ]]; then
+  if [[ ${value:0:8} == "https://" || ${value:0:7} == "http://" ]]; then
     return 0
   else
     return 1
@@ -28,7 +28,7 @@ function isTrue {
 }
 
 function isDebugging {
-  if [[ ${DEBUG^^} = TRUE ]]; then
+  if [[ -v DEBUG ]] && [[ ${DEBUG^^} = TRUE ]]; then
     return 0
   else
     return 1
@@ -37,6 +37,14 @@ function isDebugging {
 
 function debug {
   if isDebugging; then
-    echo "DEBUG: $*"
+    log "DEBUG: $*"
   fi
 }
+
+function logn {
+  echo -n "[init] $*"
+}
+
+function log {
+  echo "[init] $*"
+}