Auto-merging via docker-versions-create

# Conflicts:
#	.circleci/config.yml

.circleci/config.yml

@@ -0,0 +1,25 @@
+version: 2
+jobs:
+  minecraft_server:
+    docker:
+      - image: circleci/buildpack-deps:stable
+    steps:
+      - checkout
+      - setup_remote_docker
+      - run:
+          name: Build image
+          command: docker build -t itzg/minecraft-server:${CIRCLE_BRANCH} .
+#      - run:
+#          name: Build arm v7 image
+#          command: docker build -t itzg/minecraft-server:${CIRCLE_BRANCH}-arm-v7 --platform linux/arm/v7 --build-arg ARCH=armv7 .
+
+workflows:
+  version: 2
+  build:
+    jobs:
+      - minecraft_server:
+          filters:
+            branches:
+              ignore:
+                - armv7
+                - multiarch

.dockerignore

@@ -1,6 +1,5 @@
 data
-testdata
 examples
 k8s-examples
 .idea
-.git
+.git

.editorconfig

@@ -1,4 +1,2 @@
 [start-*]
-indent_size = 2
-indent_style = space
-end_of_line = lf
+indent_size = 2

.github/workflows/build-multiarch.yml

@@ -1,83 +0,0 @@
-name: Build and publish multiarch
-on:
-  push:
-    branches:
-      - multiarch
-      - java8-multiarch
-      - multiarch-latest
-      - java15
-      - java15-openj9
-      - test/multiarch/*
-    tags:
-      - "[0-9]+.[0-9]+.[0-9]+-multiarch"
-      - "[0-9]+.[0-9]+.[0-9]+-multiarch-latest"
-      - "[0-9]+.[0-9]+.[0-9]+-java15"
-
-jobs:
-  docker-buildx:
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2.2.0
-
-      - name: Prepare
-        id: prep
-        run: |
-          DOCKER_IMAGE=itzg/minecraft-server
-          VERSION=edge
-          if [[ $GITHUB_REF == refs/tags/* ]]; then
-            VERSION=${GITHUB_REF#refs/tags/}
-          fi
-          if [[ $GITHUB_REF == refs/heads/* ]]; then
-            VERSION=${GITHUB_REF#refs/heads/}
-            if [[ $VERSION == master ]]; then
-              VERSION=latest
-            fi
-          fi
-          TAGS="${DOCKER_IMAGE}:${VERSION//\//-}"
-          echo ::set-output name=tags::${TAGS}
-          echo ::set-output name=cache_from::${TAGS}
-          echo ::set-output name=version::${VERSION//\//-}
-          echo ::set-output name=cache_version::${VERSION//\//-}
-
-      - name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: Cache Docker layers
-        uses: actions/cache@v2
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ steps.prep.outputs.cache_version }}-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-${{ steps.prep.outputs.cache_version }}-
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USER }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Build and push
-        id: docker_build
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: ./Dockerfile
-          platforms: linux/amd64,linux/arm/v7,linux/arm64
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.prep.outputs.tags }}
-          # ensure latest base image is used
-          pull: true
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache
-          labels: |
-            org.opencontainers.image.documentation=https://github.com/itzg/docker-minecraft-server
-            org.opencontainers.image.source=https://github.com/itzg/docker-minecraft-server
-            org.opencontainers.image.version=${{ steps.prep.outputs.version }}
-            org.opencontainers.image.revision=${{ github.sha }}
-
-      - name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}

.github/workflows/main.yml

@@ -4,22 +4,20 @@ on:
   push:
     branches:
       - master
-      - java8
       - openj9
-      - openj9-11
+      - openj9-nightly
       - adopt11
-      - test/*
+      - adopt13
     tags:
       - "[0-9]+.[0-9]+.[0-9]+"
-      - "[0-9]+.[0-9]+.[0-9]+-java8"
       - "[0-9]+.[0-9]+.[0-9]+-openj9"
-      - "[0-9]+.[0-9]+.[0-9]+-openj9-11"
       - "[0-9]+.[0-9]+.[0-9]+-openj9-nightly"
       - "[0-9]+.[0-9]+.[0-9]+-adopt11"
+      - "[0-9]+.[0-9]+.[0-9]+-adopt13"
 
 jobs:
   test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v2
@@ -30,68 +28,20 @@ jobs:
   build:
     needs:
       - test
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v2
 
-    - name: Prepare
-      id: prep
-      run: |
-        DOCKER_IMAGE=itzg/minecraft-server
-        VERSION=edge
-        if [[ $GITHUB_REF == refs/tags/* ]]; then
-          VERSION=${GITHUB_REF#refs/tags/}
-        fi
-        if [[ $GITHUB_REF == refs/heads/* ]]; then
-          VERSION=${GITHUB_REF#refs/heads/}
-          if [[ $VERSION == master ]]; then
-            VERSION=latest
-          fi
-        fi
-        TAGS="${DOCKER_IMAGE}:${VERSION//\//-}"
-        echo ::set-output name=tags::${TAGS}
-        echo ::set-output name=cache_from::${TAGS}
-        echo ::set-output name=version::${VERSION//\//-}
-        echo ::set-output name=cache_version::${VERSION//\//-}
-
-    - name: Setup Docker Buildx
-      uses: docker/setup-buildx-action@v1
-
-    - name: Cache Docker layers
-      uses: actions/cache@v2
-      with:
-        path: /tmp/.buildx-cache
-        key: ${{ runner.os }}-buildx-${{ steps.prep.outputs.cache_version }}-${{ github.sha }}
-        restore-keys: |
-          ${{ runner.os }}-buildx-${{ steps.prep.outputs.cache_version }}-
-          ${{ runner.os }}-buildx-
-
-    - name: Login to DockerHub
-      uses: docker/login-action@v1
+    - name: Build and push Docker images
+      uses: docker/build-push-action@v1.1.0
       with:
+        repository: itzg/minecraft-server
         username: ${{ secrets.DOCKER_USER }}
         password: ${{ secrets.DOCKER_PASSWORD }}
-
-    - name: Build and push
-      id: docker_build
-      uses: docker/build-push-action@v2
-      with:
-        context: .
-        file: ./Dockerfile
-        # ensure latest base image is used
-        pull: true
-        # publish
+        tag_with_ref: true
+        tag_with_sha: false
+        cache_froms: itzg/minecraft-server:latest
+        add_git_labels: true
+        labels: org.opencontainers.image.url=https://github.com/itzg/docker-minecraft-server,org.opencontainers.image.documentation=https://github.com/itzg/docker-minecraft-server
         push: true
-        # tags determined by prep step
-        tags: ${{ steps.prep.outputs.tags }}
-        cache-from: type=local,src=/tmp/.buildx-cache
-        cache-to: type=local,dest=/tmp/.buildx-cache
-        labels: |
-          org.opencontainers.image.documentation=https://github.com/itzg/docker-minecraft-server
-          org.opencontainers.image.version=${{ steps.prep.outputs.version }}
-          org.opencontainers.image.source=https://github.com/itzg/docker-minecraft-server
-          org.opencontainers.image.revision=${{ github.sha }}
-
-    - name: Image digest
-      run: echo ${{ steps.docker_build.outputs.digest }}

Dockerfile

@@ -1,7 +1,10 @@
-FROM openjdk:8u212-jre-alpine
+FROM adoptopenjdk/openjdk8-openj9:alpine
 
 LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"
 
+# upgrade all packages since alpine jre8 base image tops out at 8u212
+RUN apk -U --no-cache upgrade
+
 RUN apk add --no-cache -U \
   openssl \
   imagemagick \
@@ -48,11 +51,11 @@ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
  --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.7.1 --var app=mc-monitor --file {{.app}} \
+ --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
 
 RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
- --var version=1.5.0 --var app=mc-server-runner --file {{.app}} \
+ --var version=1.4.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} \
@@ -66,15 +69,12 @@ COPY server.properties /tmp/server.properties
 COPY log4j2.xml /tmp/log4j2.xml
 WORKDIR /data
 
-STOPSIGNAL SIGTERM
-
 ENV UID=1000 GID=1000 \
-  JVM_XX_OPTS="-XX:+UseG1GC" MEMORY="1G" \
-  TYPE=VANILLA VERSION=LATEST \
-  ENABLE_RCON=true RCON_PORT=25575 RCON_PASSWORD=minecraft \
-  SERVER_PORT=25565 ONLINE_MODE=TRUE SERVER_NAME="Dedicated Server" \
-  ENABLE_AUTOPAUSE=false AUTOPAUSE_TIMEOUT_EST=3600 AUTOPAUSE_TIMEOUT_KN=120 AUTOPAUSE_TIMEOUT_INIT=600 \
-  AUTOPAUSE_PERIOD=10 AUTOPAUSE_KNOCK_INTERFACE=eth0
+  MEMORY="1G" \
+  TYPE=VANILLA VERSION=LATEST FORGEVERSION=RECOMMENDED SPONGEBRANCH=STABLE SPONGEVERSION= FABRICVERSION=LATEST LEVEL=world \
+  PVP=true DIFFICULTY=easy ENABLE_RCON=true RCON_PORT=25575 RCON_PASSWORD=minecraft \
+  LEVEL_TYPE=DEFAULT SERVER_PORT=25565 ONLINE_MODE=TRUE SERVER_NAME="Dedicated Server" \
+  ENABLE_AUTOPAUSE=false AUTOPAUSE_TIMEOUT_EST=3600 AUTOPAUSE_TIMEOUT_KN=120 AUTOPAUSE_TIMEOUT_INIT=600 AUTOPAUSE_PERIOD=10
 
 COPY start* /
 COPY health.sh /

docker-versions-create.sh

@@ -1,17 +1,7 @@
 #!/bin/bash
 #set -x
 # Use this variable to indicate a list of branches that docker hub is watching
-branches_list=(
-  'java8'
-  'java8-multiarch'
-  'openj9'
-  'openj9-11'
-  'adopt11'
-  'java15'
-  'java15-openj9'
-  'multiarch'
-  'multiarch-latest'
-  )
+branches_list=('openj9' 'openj9-nightly' 'adopt11' 'adopt13' 'multiarch')
 
 function TrapExit {
   echo "Checking out back in master"

examples/docker-compose-curseforge.yml

@@ -2,7 +2,7 @@ version: '3.2'
 
 services:
   mc:
-    image: itzg/minecraft-server:java8
+    image: itzg/minecraft-server
     volumes:
     - ./modpacks:/modpacks:ro
     environment:

examples/docker-compose-curseinstance.yml

@@ -0,0 +1,20 @@
+version: "3.7"
+
+services:
+  mc:
+    image: itzg/minecraft-server
+    ports:
+      - 25565:25565
+    volumes:
+      # Attach .../Curse/Minecraft/Instances for use at /instances
+      - ./Instances:/instances:ro
+      # Attach /data as usual
+      - ./ServerData:/data
+    environment:
+      EULA: "TRUE"
+      # Modpacks generally need more memory, so let's give at 2 GB
+      MEMORY: 2G
+      # Use new CURSE_INSTANCE type
+      TYPE: CURSE_INSTANCE
+      # Reference directory of or full path to minecraftinstance.json
+      CURSE_INSTANCE_JSON: /instances/FTB Presents SkyFactory 3

examples/docker-compose-forge.yml

@@ -2,7 +2,7 @@ version: "3.7"
 
 services:
   mc:
-    image: itzg/minecraft-server:java8
+    image: itzg/minecraft-server
     ports:
     # expose the Minecraft server port outside of container
     - 25565:25565

examples/docker-compose-ftba.yml

@@ -2,8 +2,8 @@ version: "3.7"
 
 services:
   mc:
-    # FTBA support is only available in non-Alpine images
-    image: itzg/minecraft-server:java8-multiarch
+    # FTBA support is only available in multiarch image tag
+    image: itzg/minecraft-server:multiarch
     ports:
       # expose the Minecraft server port outside of container
       - 25565:25565

examples/docker-compose-simple.yml

@@ -1,12 +0,0 @@
-version: "3"
-
-services:
-  mc:
-    image: itzg/minecraft-server
-    ports:
-      - 25565:25565
-    environment:
-      EULA: "TRUE"
-    volumes:
-      # attach the relative directory 'data' to the container's /data path
-      - ./data:/data

examples/docker-compose-spongeforge.yml

@@ -5,7 +5,7 @@ version: '3'
 
 services:
   minecraft:
-    image: itzg/minecraft-server:java8
+    image: itzg/minecraft-server
     ports:
       - "25565:25565"
     volumes:

examples/modpacks/README.md

@@ -1,3 +1,3 @@
-Place server [modpacks downloaded from CurseForge](https://www.curseforge.com/minecraft/modpacks) in this directory.
+Please server [modpacks downloaded from CurseForge](https://www.curseforge.com/minecraft/modpacks) in this directory.
 
 The example [`docker-compose-curseforge.yml`](../docker-compose-curseforge.yml) references a modpack downloaded from <https://www.curseforge.com/minecraft/modpacks/skyfactory-4/files/2787018>.

files/autopause/autopause-daemon.sh

@@ -2,48 +2,23 @@
 
 . /autopause/autopause-fcns.sh
 
-. ${SCRIPTS:-/}start-utils
+. /start-utils
 
-
-autopause_error_loop() {
-  logAutopause "Available interfaces within the docker container:"
-  INTERFACES=$(echo /sys/class/net/*)
-  INTERFACES=${INTERFACES//\/sys\/class\/net\//}
-  logAutopause "  $INTERFACES"
-  logAutopause "Please set the environment variable AUTOPAUSE_KNOCK_INTERFACE to the interface that handles incoming connections."
-  logAutopause "If unsure which interface to choose, run the ifconfig command in the container."
-  logAutopause "Autopause failed to initialize. This log entry will be printed every 30 minutes."
+sudo /usr/sbin/knockd -c /autopause/knockd-config.cfg -d
+if [ $? -ne 0 ] ; then
   while :
   do
-    sleep 1800
-    logAutopause "Autopause failed to initialize."
+    if [[ -n $(ps -o comm | grep java) ]] ; then
+      break
+    fi
+    sleep 0.1
   done
-}
-
-# wait for java process to be started
-while :
-do
-  if java_process_exists ; then
-    break
-  fi
-  sleep 0.1
-done
-
-# check for interface existence
-if [[ -z "$AUTOPAUSE_KNOCK_INTERFACE" ]] ; then
-  logAutopause "AUTOPAUSE_KNOCK_INTERFACE variable must not be empty!"
-  autopause_error_loop
-fi
-if ! [[ -d "/sys/class/net/$AUTOPAUSE_KNOCK_INTERFACE" ]] ; then
-  logAutopause "Selected interface \"$AUTOPAUSE_KNOCK_INTERFACE\" does not exist!"
-  autopause_error_loop
-fi
-
-sudo /usr/sbin/knockd -c /tmp/knockd-config.cfg -d -i "$AUTOPAUSE_KNOCK_INTERFACE"
-if [ $? -ne 0 ] ; then
   logAutopause "Failed to start knockd daemon."
-  logAutopause "Probable cause: Unable to attach to interface \"$AUTOPAUSE_KNOCK_INTERFACE\"."
-  autopause_error_loop
+  logAutopause "Possible cause: docker's host network mode."
+  logAutopause "Recreate without host mode or disable autopause functionality."
+  logAutopause "Stopping server."
+  killall -SIGTERM java
+  exit 1
 fi
 
 STATE=INIT

files/autopause/autopause-fcns.sh

@@ -8,16 +8,12 @@ java_running() {
   [[ $( ps -a -o stat,comm | grep 'java' | awk '{ print $1 }') =~ ^S.*$ ]]
 }
 
-java_process_exists() {
-  [[ -n "$(ps -a -o comm | grep 'java')" ]]
-}
-
 rcon_client_exists() {
   [[ -n "$(ps -a -o comm | grep 'rcon-cli')" ]]
 }
 
 mc_server_listening() {
-  [[ -n $(netstat -tln | grep -e "0.0.0.0:$SERVER_PORT" -e ":::$SERVER_PORT" | grep LISTEN) ]]
+  [[ -n $(netstat -tln | grep "0.0.0.0:$SERVER_PORT" | grep LISTEN) ]]
 }
 
 java_clients_connected() {
@@ -33,7 +29,7 @@ java_clients_connected() {
   # remember, that the host network mode does not work with autopause because of the knockd utility
   for (( i=0; i<${#connections[@]}; i++ ))
   do
-    if [[ ! $(echo "${connections[$i]}" | awk '{print $5}') =~ ^localhost$|^127(?:\.[0-9]+){0,2}\.[0-9]+$|^(?:0*\:)*?:?0*1$ ]] ; then
+    if [[ ! $(echo "${connections[$i]}" | awk '{print $5}') =~ ^\s*127\.0\.0\.1:.*$ ]] ; then
       # not localhost
       return 0
     fi

files/autopause/pause.sh

@@ -17,5 +17,5 @@ if [[ $( ps -a -o stat,comm | grep 'java' | awk '{ print $1 }') =~ ^S.*$ ]] ; th
 
   # finally pause the process
   logAutopauseAction "Pausing Java process"
-  pkill -STOP java
+  killall -q -STOP java
 fi

files/autopause/resume.sh

@@ -4,5 +4,5 @@
 
 if [[ $( ps -a -o stat,comm | grep 'java' | awk '{ print $1 }') =~ ^T.*$ ]] ; then
   logAutopauseAction "Knocked, resuming Java process"
-  pkill -CONT java
+  killall -q -CONT java
 fi

files/sudoers-mc

@@ -1,2 +1,2 @@
-%minecraft ALL=(ALL) NOPASSWD:/usr/bin/pkill
+%minecraft ALL=(ALL) NOPASSWD:/usr/bin/killall
 %minecraft ALL=(ALL) NOPASSWD:/usr/sbin/knockd

start

@@ -5,7 +5,7 @@
 umask 0002
 chmod g+w /data
 
-if ! isTrue "${SKIP_SUDO:-false}" && [ $(id -u) = 0 ]; then
+if [ $(id -u) = 0 ]; then
   runAsUser=minecraft
   runAsGroup=minecraft
 
@@ -36,6 +36,11 @@ if ! isTrue "${SKIP_SUDO:-false}" && [ $(id -u) = 0 ]; then
     chown -R ${runAsUser}:${runAsGroup} /data
   fi
 
+  if [[ $(stat -c "%u" /autopause) != $UID ]]; then
+    log "Changing ownership of /autopause to $UID ..."
+    chown -R ${runAsUser}:${runAsGroup} /autopause
+  fi
+
   if [[ ${SKIP_NSSWITCH_CONF^^} != TRUE ]]; then
     echo 'hosts: files dns' > /etc/nsswitch.conf
   fi

start-autopause

@@ -4,20 +4,18 @@
 
 log "Autopause functionality enabled"
 
-cp /autopause/knockd-config.cfg /tmp/knockd-config.cfg
-
 # update server port to listen to
 regseq="^\s*sequence\s*=\s*$SERVER_PORT\s*$"
-linenum=$(grep -nm1 sequence /tmp/knockd-config.cfg | cut -d : -f 1 | tail -n1)
-if ! [[ $(awk "NR==$linenum" /tmp/knockd-config.cfg) =~ $regseq ]]; then
-  sed -i "${linenum}s/sequence.*/sequence = $SERVER_PORT/" /tmp/knockd-config.cfg
+linenum=$(grep -nm1 sequence /autopause/knockd-config.cfg | cut -d : -f 1 | tail -n1)
+if ! [[ $(awk "NR==$linenum" /autopause/knockd-config.cfg) =~ $regseq ]]; then
+  sed -i "${linenum}s/sequence.*/sequence = $SERVER_PORT/" /autopause/knockd-config.cfg
   log "Updated server port in knockd config"
 fi
 # update rcon port to listen to
 regseq="^\s*sequence\s*=\s*$RCON_PORT\s*$"
-linenum=$(grep -nm2 sequence /tmp/knockd-config.cfg | cut -d : -f 1 | tail -n1)
-if ! [[ $(awk "NR==$linenum" /tmp/knockd-config.cfg) =~ $regseq ]]; then
-  sed -i "${linenum}s/sequence.*/sequence = $RCON_PORT/" /tmp/knockd-config.cfg
+linenum=$(grep -nm2 sequence /autopause/knockd-config.cfg | cut -d : -f 1 | tail -n1)
+if ! [[ $(awk "NR==$linenum" /autopause/knockd-config.cfg) =~ $regseq ]]; then
+  sed -i "${linenum}s/sequence.*/sequence = $RCON_PORT/" /autopause/knockd-config.cfg
   log "Updated rcon port in knockd config"
 fi
 
@@ -46,15 +44,10 @@ if ! [[ $AUTOPAUSE_TIMEOUT_INIT =~ ^[0-9]+$ ]] ; then
   export AUTOPAUSE_TIMEOUT_INIT
   log "Warning: AUTOPAUSE_TIMEOUT_INIT is not numeric, set to 600 (seconds)"
 fi
-if [[ "$AUTOPAUSE_KNOCK_INTERFACE" == "lo" ]] ; then
-  log "Warning: AUTOPAUSE_KNOCK_INTERFACE is set to the local loopback interface."
-  log "         This is not advisable, as incoming connections are likely not picked up there."
-  log "         Continuing with this setting."
-fi
 
-if [[ -n "$MAX_TICK_TIME" && "$MAX_TICK_TIME" != "-1" ]] ; then
+if [[ -n $MAX_TICK_TIME ]] ; then
   log "Warning: MAX_TICK_TIME is non-default, for autopause to work properly, this check should be disabled (-1 for versions >= 1.8.1)"
-elif [[ -z "$MAX_TICK_TIME" ]] ; then
+else
   if versionLessThan 1.8.1; then
     # 10 years
     MAX_TICK_TIME=315360000000

start-configuration

@@ -1,20 +1,15 @@
 #!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
 
 . ${SCRIPTS:-/}start-utils
 
-: ${EULA:=}
-: ${PROXY:=}
-: ${RCON_PASSWORD_FILE:=}
-
 shopt -s nullglob
 
 #umask 002
 export HOME=/data
 
 if [ ! -e /data/eula.txt ]; then
-  if ! isTrue "$EULA"; then
+  EULA="${EULA,,}"
+  if [ "$EULA" != "true" ]; then
     log ""
     log "Please accept the Minecraft EULA at"
     log "  https://account.mojang.com/documents/minecraft_eula"
@@ -24,7 +19,12 @@ if [ ! -e /data/eula.txt ]; then
     exit 1
   fi
 
-  writeEula
+  echo "# Generated via Docker on $(date)" > /data/eula.txt
+
+  if ! echo "eula=$EULA" >> /data/eula.txt; then
+    log "ERROR: unable to write eula to /data. Please make sure attached directory is writable by uid=${UID}"
+    exit 2
+  fi
 fi
 
 
@@ -61,11 +61,7 @@ if [[ $RCON_PASSWORD_FILE ]]; then
     log ""
 fi
 
-if ! which java > /dev/null; then
-  log "Fixing PATH to include java"
-  PATH="${PATH}:/usr/bin"
-fi
-
+export SERVER_PROPERTIES=/data/server.properties
 export VERSIONS_JSON=https://launchermeta.mojang.com/mc/game/version_manifest.json
 
 case "X$VERSION" in
@@ -75,9 +71,12 @@ case "X$VERSION" in
   XSNAPSHOT|Xsnapshot)
     VANILLA_VERSION=$(curl -fsSL $VERSIONS_JSON | jq -r '.latest.snapshot')
   ;;
-  *)
+  X[1-9]*)
     VANILLA_VERSION=$VERSION
   ;;
+  *)
+    VANILLA_VERSION=$(curl -fsSL $VERSIONS_JSON | jq -r '.latest.release')
+  ;;
 esac
 export VANILLA_VERSION
 log "Resolved version given ${VERSION} into ${VANILLA_VERSION}"
@@ -113,7 +112,7 @@ case "${TYPE^^}" in
   ;;
 
   FTB|CURSEFORGE)
-    exec ${SCRIPTS:-/}start-deployCF "$@"
+    exec ${SCRIPTS:-/}start-deployFTB "$@"
   ;;
 
   VANILLA)
@@ -144,23 +143,11 @@ case "${TYPE^^}" in
     exec ${SCRIPTS:-/}start-deployCatserver "$@"
   ;;
 
-  PURPUR)
-    exec ${SCRIPTS:-/}start-deployPurpur "$@"
-  ;;
-
-  YATOPIA)
-    exec ${SCRIPTS:-/}start-deployYatopia "$@"
-  ;;
-  
-   AIRPLANE)
-    exec ${SCRIPTS:-/}start-deployAirplane "$@"
-  ;;
-
   *)
       log "Invalid type: '$TYPE'"
       log "Must be: VANILLA, FORGE, BUKKIT, SPIGOT, PAPER, FTBA (multiarch-only),"
-      log "         CURSE_INSTANCE, CURSEFORGE, SPONGEVANILLA, TUINITY, PURPUR"
-      log "         CUSTOM, MAGMA, MOHIST, CATSERVER, YATOPIA, AIRPLANE"
+      log "         CURSE_INSTANCE, CURSEFORGE, SPONGEVANILLA,"
+      log "         CUSTOM, MAGMA, MOHIST, CATSERVER"
       exit 1
   ;;
 

start-deployAirplane

@@ -1,36 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-. ${SCRIPTS:-/}start-utils
-isDebugging && set -x
-
-JAVA_VER=$(java -version 2>&1 | head -1 | cut -d'"' -f2 | sed '/^1\./s///' | cut -d'.' -f1)
-
-if [ "${JAVA_VER}" != "8" ] && [ "${JAVA_VER}" != "11" ]; then
-  log "ERROR: Airplane server type only supports Java versions 8 and 11"
-  exit 1
-fi
-
-if [ "${VERSION}" != "LATEST" ]; then
-  log "ERROR: Airplane server type only supports VERSION=LATEST"
-  exit 1
-fi
-
-export SERVER=airplane-${VANILLA_VERSION}-jdk${JAVA_VER}.jar
-
-if [ ! -f "$SERVER" ] || isTrue "$FORCE_REDOWNLOAD"; then
-    downloadUrl="https://dl.airplane.gg/latest/Airplane-JDK${JAVA_VER}/launcher-airplane.jar"
-    log "Downloading Airplane from $downloadUrl ..."
-    curl -fsSL -o "$SERVER" "$downloadUrl"
-    if [ ! -f "$SERVER" ]; then
-      log "ERROR: failed to download from $downloadUrl (status=$?)"
-      exit 3
-    fi
-fi
-
-# Normalize on Spigot for later operations
-export TYPE=SPIGOT
-export SKIP_LOG4J_CONFIG=true
-
-exec ${SCRIPTS:-/}start-spiget "$@"

start-deployBukkitSpigot

@@ -1,7 +1,6 @@
 #!/bin/bash
 
 . ${SCRIPTS:-/}start-utils
-isDebugging && set -x
 
 set -e
 
@@ -59,41 +58,24 @@ function downloadSpigot {
       ;;
   esac
 
-  if [[ ${VERSION^^} = LATEST ]]; then
-    VANILLA_VERSION=$(restify https://getbukkit.org/download/spigot --attribute='property=og:title' | jq -r '.[0] | .attributes | select(.property == "og:title") | .content | split(" ") | .[-1]')
-  fi
-
   if [[ -z $downloadUrl ]]; then
     downloadUrl="https://cdn.getbukkit.org/${getbukkitFlavor}/${getbukkitFlavor}-${VANILLA_VERSION}.jar"
   fi
 
-  setServerVar
   if [ -f $SERVER ]; then
     # tell curl to only download when newer
-    curlArgs="-z $SERVER"
-  fi
-  if isDebugging; then
-    curlArgs="$curlArgs -v"
+    zarg="-z $SERVER"
   fi
   log "Downloading $match from $downloadUrl ..."
-  curl -fsSL -o $SERVER $curlArgs "$downloadUrl"
+  curl -fsSL -o $SERVER $zarg "$downloadUrl"
   if [[ $? != 0 || $(grep -c "DOCTYPE html" $SERVER) != 0 ]]; then
     cat <<EOF
 
 ERROR: failed to download from $downloadUrl
        Visit https://getbukkit.org/download/${getbukkitFlavor} to lookup the
-       exact version, such as 1.4.6-R0.4-SNAPSHOT or 1.8-R0.1-SNAPSHOT-latest.
-       Click into the version entry to find the **exact** version, because something
-       like "1.8" is not sufficient according to their download naming.
+       exact version, such as 1.4.6-R0.4-SNAPSHOT or 1.8-R0.1-SNAPSHOT-LATEST
 
 EOF
-
-    if isDebugging && [[ $(grep -c "DOCTYPE html" $SERVER) != 0 ]]; then
-      cat $SERVER
-    fi
-
-    # remove invalid download
-    rm $SERVER
     exit 3
   fi
 
@@ -101,19 +83,17 @@ EOF
   export JVM_OPTS
 }
 
-function setServerVar {
-  case "$TYPE" in
-    *BUKKIT|*bukkit)
-      export SERVER=craftbukkit_server-${VANILLA_VERSION}.jar
-      ;;
-    *)
-      export SERVER=spigot_server-${VANILLA_VERSION}.jar
-      ;;
-  esac
-}
+
+case "$TYPE" in
+  *BUKKIT|*bukkit)
+    export SERVER=craftbukkit_server-${VANILLA_VERSION}.jar
+    ;;
+  *)
+    export SERVER=spigot_server-${VANILLA_VERSION}.jar
+    ;;
+esac
 
 if isTrue "$BUILD_SPIGOT_FROM_SOURCE" || isTrue "$BUILD_FROM_SOURCE"; then
-  setServerVar
   if [ ! -f $SERVER ] || [ -n "$FORCE_REDOWNLOAD" ]; then
     buildSpigotFromSource
   fi
@@ -125,4 +105,5 @@ fi
 export TYPE=SPIGOT
 export SKIP_LOG4J_CONFIG=true
 
-exec ${SCRIPTS:-/}start-spiget "$@"
+# Continue to Final Setup
+exec ${SCRIPTS:-/}start-finalSetupWorld $@

start-deployCustom

@@ -1,7 +1,6 @@
 #!/bin/bash
 
 . ${SCRIPTS:-/}start-utils
-isDebugging && set -x
 
 if isURL ${CUSTOM_SERVER}; then
   filename=$(basename ${CUSTOM_SERVER})
@@ -18,16 +17,12 @@ if isURL ${CUSTOM_SERVER}; then
   fi
 
 elif [[ -f ${CUSTOM_SERVER} ]]; then
-  export SERVER=${CUSTOM_SERVER}
-
-elif [[ ${GENERIC_PACK} ]]; then
-  log "Using custom server jar from generic pack at ${CUSTOM_SERVER} ..."
+  log "Using custom server jar at ${CUSTOM_SERVER} ..."
   export SERVER=${CUSTOM_SERVER}
 
 else
   log "CUSTOM_SERVER is not properly set to a URL or existing jar file"
   exit 2
-
 fi
 
 export SKIP_LOG4J_CONFIG=true

start-deployFTB

@@ -1,117 +1,26 @@
 #!/bin/bash
 
-set -e
-
 . ${SCRIPTS:-/}start-utils
 
-loadForgeVars() {
-  cfgFile=${1?}
-  pat='^([^#;][^=]+)=[:space:]*([^;]*)'
-  while read -r line || [[ -n "$line" ]] ; do
-      if [[ $line =~ $pat ]]; then
-          #echo "MATCHED $line"
-          k=${BASH_REMATCH[1]}
-          v=${BASH_REMATCH[2]}
-          case $k in
-            FORGEURL)
-              forgeInstallerUrl="$v"
-              ;;
-          esac
-      fi
-  done < "$cfgFile"
-}
-
-isDebugging && set -x
-
-: ${FTB_BASE_DIR:=${CF_BASE_DIR:-/data/FeedTheBeast}}
-export FTB_BASE_DIR
-
-legacyJavaFixerUrl=https://ftb.forgecdn.net/FTB2/maven/net/minecraftforge/lex/legacyjavafixer/1.0/legacyjavafixer-1.0.jar
-export TYPE=CURSEFORGE
+export FTB_BASE_DIR=/data/FeedTheBeast
+legacyJavaFixerUrl=http://ftb.cursecdn.com/FTB2/maven/net/minecraftforge/lex/legacyjavafixer/1.0/legacyjavafixer-1.0.jar
+export TYPE=FEED-THE-BEAST
 
 FTB_SERVER_MOD=${FTB_SERVER_MOD:-$CF_SERVER_MOD}
 
 log "Looking for Feed-The-Beast / CurseForge server modpack."
-requireVar FTB_SERVER_MOD
-
-if ! isTrue ${USE_MODPACK_START_SCRIPT:-true}; then
-  if ! [ -f "${FTB_SERVER_MOD}" ]; then
-    log "ERROR unable to find requested modpack file ${FTB_SERVER_MOD}"
+if [[ -z $FTB_SERVER_MOD ]]; then
+    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
-
-  needsInstall=true
-  installMarker=/data/.curseforge-installed
-  if [ -f $installMarker ]; then
-    if [ "$(cat $installMarker)" != "${FTB_SERVER_MOD}" ]; then
-      log "Upgrading modpack"
-
-      serverJar=$(find ${FTB_BASE_DIR} -not -name "forge*installer.jar" -name "forge*.jar")
-      if [[ "${serverJar}" ]]; then
-        rm -rf $(dirname "${serverJar}")/{mods,*.jar,libraries,resources,scripts,config}
-      fi
-    else
-      needsInstall=false
-    fi
-  fi
-
-  if $needsInstall; then
-    log "Unpacking FTB server modpack ${FTB_SERVER_MOD} ..."
-    mkdir -p ${FTB_BASE_DIR}
-    unzip -o "${FTB_SERVER_MOD}" -d ${FTB_BASE_DIR} | awk '{printf "."} END {print ""}'
-
-    SERVER=$(find ${FTB_BASE_DIR} -type f -not -name "forge*installer.jar" -name "forge*.jar")
-    if [[ -z "$SERVER" ]]; then
-
-      if [ -f "${FTB_BASE_DIR}/settings.cfg" ]; then
-        loadForgeVars "${FTB_BASE_DIR}/settings.cfg"
-
-        if [[ $forgeInstallerUrl ]]; then
-          forgeInstallerJar="${FTB_BASE_DIR}/forge-installer.jar"
-          if ! curl -fsSL -o "$forgeInstallerJar" "$forgeInstallerUrl" ; then
-            log "ERROR failed to download Forge installer from $forgeInstallerUrl"
-            exit 2
-          fi
-        fi
-      else
-        forgeInstallerJar=$(find "${FTB_BASE_DIR}" -name "forge*installer.jar")
-      fi
-
-      if [[ -z "${forgeInstallerJar}" ]]; then
-        log "ERROR Unable to find forge installer in modpack"
-        log "      or download using modpack config."
-        log "      Make sure you downloaded the server files."
-        exit 2
-      fi
-
-      log "Installing forge server"
-      (cd $(dirname "${forgeInstallerJar}"); java -jar $(basename "${forgeInstallerJar}") --installServer)
-    fi
-
-    echo "${FTB_SERVER_MOD}" > $installMarker
-    SERVER=$(find ${FTB_BASE_DIR} -type f -not -name "forge*installer.jar" -name "forge*.jar")
-  fi
-
-  if [[ -z "${SERVER}" || ! -f "${SERVER}" ]]; then
-    log "ERROR unable to locate installed forge server jar"
-    isDebugging && find ${FTB_BASE_DIR} -name "forge*.jar"
-    exit 2
-  fi
-  export SERVER
-
-  export FTB_DIR=$(dirname "${SERVER}")
-
-  exec ${SCRIPTS:-/}start-finalSetupWorld $@
 fi
 
 entryScriptExpr="
   -name ServerStart.sh
-  -o -name serverstart.sh
   -o -name ServerStartLinux.sh
   -o -name LaunchServer.sh
   -o -name server-start.sh
-  -o -name startserver.sh
-  -o -name StartServer.sh
   "
 
 if [[ -d ${FTB_BASE_DIR} ]]; then
@@ -129,7 +38,7 @@ fi
 # this allows saving just the world separate from the rest of the data directory
 if [[ $startScriptCount = 0 ]]; then
   srv_modpack=${FTB_SERVER_MOD}
-  if isURL "${srv_modpack}"; then
+  if isURL ${srv_modpack}; then
       case $srv_modpack in
         https://www.feed-the-beast.com/*/download|https://www.curseforge.com/minecraft/modpacks/*/download/*/file)
           ;;
@@ -147,19 +56,19 @@ if [[ $startScriptCount = 0 ]]; then
       fi
       srv_modpack=$downloaded
   fi
-  if [[ "${srv_modpack:0:5}" == "data/" ]]; then
+  if [[ ${srv_modpack:0:5} == "data/" ]]; then
       # Prepend with "/"
-      srv_modpack="/${srv_modpack}"
+      srv_modpack=/${srv_modpack}
   fi
-  if [[ ! "${srv_modpack:0:1}" == "/" ]]; then
+  if [[ ! ${srv_modpack:0:1} == "/" ]]; then
       # If not an absolute path, assume file is in "/data"
       srv_modpack=/data/${srv_modpack}
   fi
-  if [[ ! -f "${srv_modpack}" ]]; then
+  if [[ ! -f ${srv_modpack} ]]; then
       log "FTB server modpack ${srv_modpack} not found."
       exit 2
   fi
-  if [[ ! "${srv_modpack: -4}" == ".zip" ]]; then
+  if [[ ! ${srv_modpack: -4} == ".zip" ]]; then
       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
@@ -167,17 +76,7 @@ if [[ $startScriptCount = 0 ]]; then
 
   log "Unpacking FTB server modpack ${srv_modpack} ..."
   mkdir -p ${FTB_BASE_DIR}
-  unzip -o "${srv_modpack}" -d ${FTB_BASE_DIR} | awk '{printf "."} END {print ""}'
-
-  installScript=$(find "${FTB_BASE_DIR}" -maxdepth 2 -type f -name install.sh)
-  if [[ "$installScript" ]]; then
-    (
-      cd "$(dirname "${installScript}")"
-      chmod +x ./install.sh
-      log "Running included install.sh"
-      ./install.sh
-    )
-  fi
+  unzip -o ${srv_modpack} -d ${FTB_BASE_DIR} | awk '{printf "."} END {print ""}'
 fi
 
 if [[ $(find ${FTB_BASE_DIR} $entryScriptExpr | wc -l) = 0 ]]; then
@@ -215,7 +114,7 @@ export FTB_SERVER_START=$(find "${FTB_BASE_DIR}" $entryScriptExpr)
 
 export FTB_DIR=$(dirname "${FTB_SERVER_START}")
 chmod a+x "${FTB_SERVER_START}"
-grep fml.queryResult=confirm "${FTB_SERVER_START}" > /dev/null || \
+grep fml.queryResult=confirm ${FTB_SERVER_START} > /dev/null || \
     sed -i 's/-jar/-Dfml.queryResult=confirm -jar/' "${FTB_SERVER_START}"
 sed -i 's/.*read.*Restart now/#\0/' "${FTB_SERVER_START}"
 legacyJavaFixerPath="${FTB_DIR}/mods/legacyjavafixer.jar"

start-deployFabric

@@ -7,34 +7,36 @@ export TYPE=FABRIC
 
 FABRIC_INSTALLER=${FABRIC_INSTALLER:-}
 FABRIC_INSTALLER_URL=${FABRIC_INSTALLER_URL:-}
-FABRIC_INSTALLER_VERSION=${FABRIC_INSTALLER_VERSION:-${FABRICVERSION:-LATEST}}
+FABRICVERSION=${FABRICVERSION:-LATEST}
 if [[ -z $FABRIC_INSTALLER && -z $FABRIC_INSTALLER_URL ]]; then
   log "Checking Fabric version information."
-  case $FABRIC_INSTALLER_VERSION in
+  case $FABRICVERSION in
     LATEST)
-      FABRIC_INSTALLER_VERSION=$(maven-metadata-release https://maven.fabricmc.net/net/fabricmc/fabric-installer/maven-metadata.xml)
+      FABRIC_VERSION=$(maven-metadata-release https://maven.fabricmc.net/net/fabricmc/fabric-installer/maven-metadata.xml)
+      ;;
+
+    *)
+      FABRIC_VERSION=$FABRICVERSION
       ;;
   esac
 
-  FABRIC_INSTALLER="/tmp/fabric-installer-${FABRIC_INSTALLER_VERSION}.jar"
-  markerVersion=$FABRIC_INSTALLER_VERSION
+  FABRIC_INSTALLER="/tmp/fabric-installer-$FABRIC_VERSION.jar"
 
 elif [[ -z $FABRIC_INSTALLER ]]; then
   FABRIC_INSTALLER="/tmp/fabric-installer.jar"
-  markerVersion=custom
 elif [[ ! -e $FABRIC_INSTALLER ]]; then
   log "ERROR: the given Fabric installer doesn't exist : $FABRIC_INSTALLER"
   exit 2
 fi
 
-installMarker="/data/.fabric-installed-${VANILLA_VERSION}-${markerVersion}"
+installMarker="/data/.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
-      log "Downloading installer version $FABRIC_INSTALLER_VERSION"
-      downloadUrl="https://maven.fabricmc.net/net/fabricmc/fabric-installer/${FABRIC_INSTALLER_VERSION}/fabric-installer-${FABRIC_INSTALLER_VERSION}.jar"
+      log "Downloading $FABRIC_VERSION"
+      downloadUrl="https://maven.fabricmc.net/net/fabricmc/fabric-installer/$FABRIC_VERSION/fabric-installer-$FABRIC_VERSION.jar"
       log "...trying $downloadUrl"
       curl -o $FABRIC_INSTALLER -fsSL $downloadUrl
     else
@@ -47,17 +49,14 @@ if [[ ! -e $installMarker ]]; then
   fi
 
   if isDebugging; then
-    debug "Installing Fabric ${VANILLA_VERSION} using $FABRIC_INSTALLER"
+    debug "Installing Fabric $FABRIC_VERSION using $FABRIC_INSTALLER with mcversion ${VANILLA_VERSION}"
   else
-    log "Installing Fabric using $FABRIC_INSTALLER"
+    log "Installing Fabric $FABRIC_VERSION using $FABRIC_INSTALLER"
   fi
   tries=3
   set +e
   while ((--tries >= 0)); do
-    java -jar $FABRIC_INSTALLER server \
-      -mcversion $VANILLA_VERSION \
-      -downloadMinecraft \
-      -dir /data
+    java -jar $FABRIC_INSTALLER server -mcversion $VANILLA_VERSION -downloadMinecraft
     if [[ $? == 0 ]]; then
       break
     fi

start-deployForge

@@ -1,9 +1,8 @@
 #!/bin/bash
 
 . ${SCRIPTS:-/}start-utils
+
 export TYPE=FORGE
-: ${FORGEVERSION:=RECOMMENDED}
-isDebugging && set -x
 
 if [[ -z $FORGE_INSTALLER && -z $FORGE_INSTALLER_URL ]]; then
   norm=$VANILLA_VERSION
@@ -46,8 +45,6 @@ elif [[ -z $FORGE_INSTALLER ]]; then
 elif [[ ! -e $FORGE_INSTALLER ]]; then
   log "ERROR: the given Forge installer doesn't exist : $FORGE_INSTALLER"
   exit 2
-else
-  shortForgeVersion=$VANILLA_VERSION-custom
 fi
 
 installMarker="/data/.forge-installed-$shortForgeVersion"
@@ -100,11 +97,7 @@ if [ ! -e $installMarker ]; then
   log "Finding installed server jar..."
   unset -v latest
   for file in *forge*.jar; do
-    if ! [[ $file =~ installer ]]; then
-      if [[ -z $latest ]] || [[ $file -nt $latest ]]; then
-        latest=$file
-      fi
-    fi
+    [[ $file =~ installer ]] || [[ $file -nt $latest ]] && latest=$file
   done
   if [[ -z $latest ]]; then
     log "Unable to derive server jar for Forge"

start-deployMohist

@@ -6,7 +6,6 @@ set -e
 isDebugging && set -x
 
 requireVar VANILLA_VERSION
-: ${MOHIST_BUILD:=lastSuccessfulBuild}
 
 mohistJobs=https://ci.codemc.io/job/Mohist-Community/job/
 mohistJob=${mohistJobs}Mohist-${VANILLA_VERSION}/
@@ -18,12 +17,12 @@ if ! curl -X HEAD -o /dev/null -fsSL "${mohistJob}"; then
   exit 1
 fi
 
-buildRelPath=$(
-  curl -fsSL "${mohistJob}${MOHIST_BUILD}/api/json" |
+latestBuildRelPath=$(
+  curl -fsSL "${mohistJob}lastSuccessfulBuild/api/json" |
     jq -r '.artifacts[0].relativePath'
 )
 
-baseName=$(basename "${buildRelPath}")
+baseName=$(basename "${latestBuildRelPath}")
 if [[ ${baseName} != *-server.jar* ]]; then
   log "ERROR: mohist build for ${VANILLA_VERSION} is not a valid server jar, found ${baseName}"
   log "       check https://ci.codemc.io/job/Mohist-Community/ for available versions"
@@ -35,7 +34,7 @@ export SERVER="/data/${baseName}"
 
 if [ ! -f ${SERVER} ]; then
   log "Downloading ${baseName}"
-  curl -o "${SERVER}" -fsSL "${mohistJob}${MOHIST_BUILD}/artifact/${buildRelPath}"
+  curl -o "${SERVER}" -fsSL "${mohistJob}lastSuccessfulBuild/artifact/${latestBuildRelPath}"
 fi
 
 export SKIP_LOG4J_CONFIG=true

start-deployPaper

@@ -1,79 +1,24 @@
 #!/bin/bash
 
 . ${SCRIPTS:-/}start-utils
-set -o pipefail
-isDebugging && set -x
 
-if [[ $PAPER_DOWNLOAD_URL ]]; then
-  export SERVER=$(getFilenameFromUrl "${PAPER_DOWNLOAD_URL}")
+: ${PAPERBUILD:=latest}
+export SERVER=paper_server-${VANILLA_VERSION}-${PAPERBUILD}.jar
 
-  if [ -f "$SERVER" ]; then
-    zarg=(-z "$SERVER")
-  fi
+if [ -f "$SERVER" ] && ! isTrue "$FORCE_REDOWNLOAD"; then
+  zarg="-z '$SERVER'"
+fi
 
-  echo "Preparing custom PaperMC jar from $PAPER_DOWNLOAD_URL"
-
-  curl -fsSL -o "$SERVER" "${zarg[@]}" "${PAPER_DOWNLOAD_URL}"
-else
-  # PaperMC API v2 docs : https://papermc.io/api/docs/swagger-ui/index.html?configUrl=/api/openapi/swagger-config
-
-  build=${PAPERBUILD:=$(curl -fsSL "https://papermc.io/api/v2/projects/paper/versions/${VANILLA_VERSION}" -H  "accept: application/json" \
-   | jq '.builds[-1]')}
-  case $? in
-    0)
-      ;;
-    22)
-      versions=$(curl -fsSL "https://papermc.io/api/v2/projects/paper" -H  "accept: application/json")
-      if [[ $VERSION = LATEST ]]; then
-          VANILLA_VERSION=$(echo "$versions" | jq -r '.versions[-1]')
-          log "WARN: using ${VANILLA_VERSION} since that's the latest provided by PaperMC"
-          # re-execute the current script with the newly computed version
-          exec "$0" "$@"
-      fi
-      log "ERROR: ${VANILLA_VERSION} is not published by PaperMC"
-      log "       Set VERSION to one of the following: "
-      log "       $(echo "$versions" | jq -r '.versions | join(", ")')"
-      exit 1
-      ;;
-    *)
-      echo "ERROR: unknown error while looking up PaperMC version=${VANILLA_VERSION}"
-      exit 1
-      ;;
-  esac
-  if [ $? != 0 ]; then
-    echo "ERROR: failed to lookup PaperMC build from version ${VANILLA_VERSION}"
-    exit 1
-  fi
-
-  export SERVER=$(curl -fsSL "https://papermc.io/api/v2/projects/paper/versions/${VANILLA_VERSION}/builds/${build}" -H  "accept: application/json" \
-   | jq -r '.downloads.application.name')
-  if [ $? != 0 ]; then
-    echo "ERROR: failed to lookup PaperMC download file from version=${VANILLA_VERSION} build=${build}"
-    exit 1
-  fi
-
-  if [ -f "$SERVER" ]; then
-    zarg=(-z "$SERVER")
-  fi
-
-  log "Removing old PaperMC versions ..."
-  shopt -s nullglob
-  for f in paper-*.jar; do
-    [[ $f != $SERVER ]] && rm $f
-  done
-
-  log "Downloading PaperMC $VANILLA_VERSION (build $build) ..."
-  curl -fsSL -o "$SERVER" "${zarg[@]}" \
-    "https://papermc.io/api/v2/projects/paper/versions/${VANILLA_VERSION}/builds/${build}/downloads/${SERVER}" \
-    -H  "accept: application/java-archive"
-  if [ $? != 0 ]; then
-    echo "ERROR: failed to download PaperMC from version=${VANILLA_VERSION} build=${build} download=${SERVER}"
-    exit 1
-  fi
+downloadUrl=${PAPER_DOWNLOAD_URL:-https://papermc.io/api/v1/paper/${VANILLA_VERSION}/${PAPERBUILD}/download}
+log "Downloading Paper $VANILLA_VERSION (build $PAPERBUILD) from $downloadUrl ..."
+if ! curl -fsSL -o "$SERVER" $zarg "$downloadUrl"; then
+  log "ERROR: failed to download from $downloadUrl (status=$?)"
+  exit 3
 fi
 
 # Normalize on Spigot for downstream operations
 export TYPE=SPIGOT
 export SKIP_LOG4J_CONFIG=true
 
-exec ${SCRIPTS:-/}start-spiget "$@"
+# Continue to Final Setup
+exec ${SCRIPTS:-/}start-finalSetupWorld $@

start-deployPurpur

@@ -1,37 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-. ${SCRIPTS:-/}start-utils
-isDebugging && set -x
-
-: ${VANILLA_VERSION:?}
-: ${PURPUR_BUILD:=LATEST}
-: ${FORCE_REDOWNLOAD:=false}
-
-if [[ ${PURPUR_BUILD} == LATEST ]]; then
-  PURPUR_BUILD=$(curl -fsSL "https://purpur.pl3x.net/api/v1/purpur/${VANILLA_VERSION}" |
-    jq -r '.builds.latest' || echo "")
-  if [[ -z ${PURPUR_BUILD} ]]; then
-    log "ERROR: Failed to locate a Purpur build for ${VANILLA_VERSION}."
-    log "       Please check if a download is available at https://purpur.pl3x.net/downloads/"
-    exit 3
-  fi
-fi
-
-export SERVER="purpur-${VANILLA_VERSION}-${PURPUR_BUILD}.jar"
-
-if [ ! -f "$SERVER" ] || isTrue "$FORCE_REDOWNLOAD"; then
-    downloadUrl="https://purpur.pl3x.net/api/v1/purpur/${VANILLA_VERSION}/${PURPUR_BUILD}/download"
-    log "Downloading Purpur from $downloadUrl ..."
-    if ! curl -fsSL -o "$SERVER" "$downloadUrl"; then
-      log "ERROR: failed to download from $downloadUrl (status=$?)"
-      exit 3
-    fi
-fi
-
-# Normalize on Spigot for later operations
-export TYPE=SPIGOT
-export SKIP_LOG4J_CONFIG=true
-
-exec ${SCRIPTS:-/}start-spiget "$@"

start-deploySpongeVanilla

@@ -3,8 +3,6 @@
 . ${SCRIPTS:-/}start-utils
 
 export TYPE=spongevanilla
-: ${SPONGEBRANCH:=STABLE}
-: ${SPONGEVERSION:=}
 
 # Parse branch
 log "Choosing branch for Sponge"

start-deployTuinity

@@ -20,7 +20,8 @@ if [ ! -f "$SERVER" ] || [ -n "$FORCE_REDOWNLOAD" ]; then
     fi
 fi
 
-# Normalize on Spigot for later operations
+# Normalize on Spigot for operations below
 export TYPE=SPIGOT
 
-exec ${SCRIPTS:-/}start-spiget "$@"
+# Continue to Final Setup
+exec ${SCRIPTS:-/}start-finalSetupWorld $@

start-deployVanilla

@@ -26,9 +26,6 @@ if [ ! -e $SERVER ] || [ -n "$FORCE_REDOWNLOAD" ]; then
   if [ $result != 0 ]; then
     log "ERROR failed to obtain version manifest from $versionManifestUrl ($result)"
     exit 1
-  elif [ $serverDownloadUrl = null ]; then
-    log "ERROR version $VANILLA_VERSION does not provide a server download"
-    exit 1
   fi
 
   debug "Downloading server from $serverDownloadUrl"

start-deployYatopia

@@ -1,30 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-. ${SCRIPTS:-/}start-utils
-isDebugging && set -x
-
-: ${VANILLA_VERSION:?}
-: ${RELEASE:=stable}
-: ${FORCE_REDOWNLOAD:=false}
-
-requireEnum RELEASE stable latest
-
-export SERVER="yatopia-${RELEASE}-${VANILLA_VERSION}.jar"
-
-if [ ! -f "$SERVER" ] || isTrue "$FORCE_REDOWNLOAD"; then
-    downloadUrl="https://api.yatopiamc.org/v2/${RELEASE}Build/download?branch=ver/${VANILLA_VERSION}"
-    log "Downloading Yatopia from $downloadUrl ..."
-    if ! curl -fsSL -o "$SERVER" "$downloadUrl"; then
-      log "ERROR: failed to download from $downloadUrl (status=$?)"
-      exit 3
-    fi
-fi
-
-# Normalize on Spigot for later operations
-export TYPE=SPIGOT
-export SKIP_LOG4J_CONFIG=true
-
-# Continue to Final Setup
-exec ${SCRIPTS:-/}start-finalSetupWorld $@

start-finalSetupEnvVariables

@@ -5,47 +5,42 @@
 : ${ENV_VARIABLE_PREFIX:=CFG_}
 
 if isTrue "${REPLACE_ENV_VARIABLES}"; then
-  log "Replacing env variables in configs that match the prefix $ENV_VARIABLE_PREFIX ..."
+  log "Replacing env variables in configs that match the prefix $ENV_VARIABLE_PREFIX..."
+  findExcludes=
 
   # File excludes
-  fileExcludes=
   for f in ${REPLACE_ENV_VARIABLES_EXCLUDES}; do
-    fileExcludes="${fileExcludes} -not -name $f"
+    findExcludes="${findExcludes} -not -name $f"
   done
 
   # Directory excludes (recursive)
   dirExcludes=$(join_by " -o -path " ${REPLACE_ENV_VARIABLES_EXCLUDE_PATHS})
   if [[ $dirExcludes ]]; then
-    dirExcludes=" -type d ( -path ${dirExcludes} ) -prune -o"
+    findExcludes+=" -type d ( -path ${dirExcludes} ) -prune"
   fi
 
-  isDebugging && echo "Using find file exclusions: $fileExcludes"
-  isDebugging && echo "Using find directory exclusions: $dirExcludes"
+  isDebugging && echo "Using find exclusions: $findExcludes"
 
-  for name in $(compgen -v $ENV_VARIABLE_PREFIX); do
+  while IFS='=' read -r name value ; do
     # check if name of env variable matches the prefix
     # sanity check environment variables to avoid code injections
-    # Read content from file environment
-    if [[ $name = *"_FILE" ]]; then
-      value=$(<${!name})
-      name="${name%_FILE}"
-    else
-      value=${!name}
+    if [[ "$name" = $ENV_VARIABLE_PREFIX* ]] \
+        && [[ $value =~ ^[0-9a-zA-Z_:/=?.+\-]*$ ]] \
+        && [[ $name =~ ^[0-9a-zA-Z_\-]*$ ]]; then
+      # Read content from file environment
+      if [[ $name = *"_FILE" ]] && [[ -f $value ]]; then
+        name="${name/_FILE/}"
+        value=$(<$value)
+      fi
+
+      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" \) \
+          $findExcludes \
+          -exec sed -i 's#${'"$name"'}#'"$value"'#g' {} \;
     fi
-
-    log "Replacing $name with $value ..."
-
-    value=${value//\\/\\\\}
-    value=${value//#/\\#}
-
-    find /data/ \
-        $dirExcludes \
-        -type f \
-        \( -name "*.yml" -or -name "*.yaml" -or -name "*.txt" -or -name "*.cfg" \
-        -or -name "*.conf" -or -name "*.properties" -or -name "*.hjson" -or -name "*.json" \) \
-        $fileExcludes \
-        -exec sed -i 's#${'"$name"'}#'"$value"'#g' {} \;
-  done
+  done < <(env)
 fi
 
 exec ${SCRIPTS:-/}start-minecraftFinalSetup $@

start-finalSetupModconfig

@@ -24,4 +24,4 @@ case "X$MODCONFIG" in
 esac
 fi
 
-exec ${SCRIPTS:-/}start-finalSetupMounts $@
+exec ${SCRIPTS:-/}start-finalSetupPlugins $@

start-finalSetupModpack

@@ -1,97 +1,80 @@
 #!/bin/bash
 
-set -e -o pipefail
+set -e
 
 . ${SCRIPTS:-/}start-utils
-if isDebugging; then
-  set -x
-fi
 
 #  CURSE_URL_BASE used in manifest downloads below
 CURSE_URL_BASE=${CURSE_URL_BASE:-https://minecraft.curseforge.com/projects}
 
 # Remove old mods/plugins
-if isTrue ${REMOVE_OLD_MODS:-false}; then
-  removeOldMods /data/mods
-  removeOldMods /data/plugins
+if [ "$REMOVE_OLD_MODS" = "TRUE" ]; then
+  if [ "$TYPE" = "SPIGOT" ]; then
+    rm -rf /data/plugins/*
+  else
+    rm -rf /data/mods/*
+  fi
 fi
 
 # If supplied with a URL for a modpack (simple zip of jars), download it and unpack
 if [[ "$MODPACK" ]]; then
-  if isURL "${MODPACK}"; then
-    if [[ "${MODPACK}" == *.zip ]]; then
-      downloadUrl="${MODPACK}"
-    else
-      downloadUrl=$(curl -Ls -o /dev/null -w %{effective_url} $MODPACK)
-      if ! [[ $downloadUrl == *.zip ]]; then
-        log "ERROR Invalid URL given for MODPACK: $downloadUrl resolved from $MODPACK"
-        log "      Must be HTTP, HTTPS or FTP and a ZIP file"
-        exit 1
-      fi
-    fi
-
-    log "Downloading mod/plugin pack"
-    log "  from $downloadUrl ..."
-    if ! curl -sSL -o /tmp/modpack.zip "$downloadUrl"; then
-      log "ERROR: failed to download from $downloadUrl"
+EFFECTIVE_MODPACK_URL=$(curl -Ls -o /dev/null -w %{url_effective} $MODPACK)
+case "X$EFFECTIVE_MODPACK_URL" in
+  X[Hh][Tt][Tt][Pp]*.zip)
+    log "Downloading mod/plugin pack via HTTP"
+    log "  from $EFFECTIVE_MODPACK_URL ..."
+    if ! curl -sSL -o /tmp/modpack.zip "$EFFECTIVE_MODPACK_URL"; then
+      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
-        log "ERROR: failed to unzip the modpack from $downloadUrl"
+        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
-        log "ERROR: failed to unzip the modpack from $downloadUrl"
+        log "ERROR: failed to unzip the modpack from $EFFECTIVE_MODPACK_URL"
       fi
     fi
     rm -f /tmp/modpack.zip
-
-  else
-    log "ERROR Invalid URL given for MODPACK: $MODPACK"
-    exit 1
-  fi
+    ;;
+  *)
+    log "Invalid URL given for modpack: Must be HTTP or HTTPS and a ZIP file"
+    ;;
+esac
 fi
 
 # If supplied with a URL for a plugin download it.
 if [[ "$MODS" ]]; then
-  if [ "$TYPE" = "SPIGOT" ]; then
-    out_dir=/data/plugins
-  else
-    out_dir=/data/mods
-  fi
-  mkdir -p "$out_dir"
-
-  for i in ${MODS//,/ }
-  do
-    if isURL $i; then
-      log "Downloading mod/plugin $i ..."
-      if isValidFileURL jar "$i"; then
-        if ! curl -fsSL -o "${out_dir}/$(getFilenameFromUrl "${i}")" "${i}"; then
-          log "ERROR: failed to download from $i into $out_dir"
-          exit 2
-        fi
-      else
-        effective_url=$(resolveEffectiveUrl "$i")
-        if isValidFileURL jar "${effective_url}"; then
-          out_file=$(getFilenameFromUrl "${effective_url}")
-          if ! curl -fsSL -o "${out_dir}/$out_file" "${effective_url}"; then
-            log "ERROR: failed to download from $i into $out_dir"
-            exit 2
-          fi
-        else
-          log "ERROR: $effective_url resolved from $i is not a valid jar URL"
-          exit 2
-        fi
+for i in ${MODS//,/ }
+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)
+      log "Downloading mod/plugin via HTTP"
+      log "  from $EFFECTIVE_MOD_URL ..."
+      if ! curl -sSL -o /tmp/${EFFECTIVE_MOD_URL##*/} $EFFECTIVE_MOD_URL; then
+        log "ERROR: failed to download from $EFFECTIVE_MOD_URL to /tmp/${EFFECTIVE_MOD_URL##*/}"
+        exit 2
       fi
-    else
-      log "ERROR Invalid URL given in MODS: $i"
-      exit 2
-    fi
-  done
+
+      if [ "$TYPE" = "SPIGOT" ]; then
+        mkdir -p /data/plugins
+        mv /tmp/${EFFECTIVE_MOD_URL##*/} /data/plugins/${EFFECTIVE_MOD_URL##*/}
+      else
+        mkdir -p /data/mods
+        mv /tmp/${EFFECTIVE_MOD_URL##*/} /data/mods/${EFFECTIVE_MOD_URL##*/}
+      fi
+      rm -f /tmp/${EFFECTIVE_MOD_URL##*/}
+      ;;
+    *)
+      log "Invalid URL given for modpack: Must be HTTP or HTTPS and a JAR file"
+      ;;
+  esac
+done
 fi
 
 if [[ "$MANIFEST" ]]; then
@@ -99,7 +82,7 @@ if [[ "$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 %{effective_url} $MANIFEST)
+        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"
@@ -120,7 +103,7 @@ case "X$EFFECTIVE_MANIFEST_FILE" in
       do
         if [ ! -f $MOD_DIR/${p}_${f}.jar ]
         then
-          redirect_url="$(curl -Ls -o /dev/null -w %{effective_url} ${CURSE_URL_BASE}/${p})"
+          redirect_url="$(curl -Ls -o /dev/null -w %{url_effective} ${CURSE_URL_BASE}/${p})"
           url="$redirect_url/download/${f}/file"
           log Downloading curseforge mod $url
           #  Manifest usually doesn't have mod names. Using id should be fine, tho
@@ -139,17 +122,17 @@ fi
 
 if [[ "${GENERIC_PACK}" ]]; then
   if isURL "${GENERIC_PACK}"; then
-    log "Downloading generic pack ..."
-    curl -fsSL -o /tmp/generic_pack.zip "${GENERIC_PACK}"
-    GENERIC_PACK=/tmp/generic_pack.zip
+    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}
-    isDebugging && ls -l "${GENERIC_PACK}"
-    unzip -q -d ${base_dir} "${GENERIC_PACK}"
+    unzip -q -d ${base_dir} ${GENERIC_PACK}
     if [ -f /data/manifest.txt ]; then
       log "Manifest exists from older generic pack, cleaning up ..."
       while read f; do
@@ -167,7 +150,7 @@ if [[ "${GENERIC_PACK}" ]]; then
     for d in $(find ${base_dir} -type d); do mkdir -p "$(sed "s#${base_dir}#/data#" <<< $d)"; done
     for f in $(find ${base_dir} -type f); do cp -f "$f" "$(sed "s#${base_dir}#/data#" <<< $f)"; done
     rm -rf ${base_dir}
-    sha256sum "${GENERIC_PACK}" > ${sum_file}
+    sha256sum ${GENERIC_PACK} > ${sum_file}
   fi
 fi
 

start-finalSetupMounts

@@ -1,40 +0,0 @@
-#!/bin/bash
-
-. ${SCRIPTS:-/}start-utils
-
-: ${PLUGINS_SYNC_UPDATE:=true}
-
-isDebugging && set -x
-
-if [ -d /plugins ]; then
-  case ${TYPE} in
-    SPIGOT|BUKKIT|PAPER|MAGMA)
-      mkdir -p /data/plugins
-      log "Copying plugins over..."
-      if isTrue ${PLUGINS_SYNC_UPDATE}; then
-        updateArg="--update"
-      fi
-      # Copy plugins over using rsync to allow deeply nested updates of plugins
-      rsync -a --out-format="update:%f:Last Modified %M" --prune-empty-dirs $updateArg /plugins /data
-      ;;
-  esac
-fi
-
-# If any modules have been provided, copy them over
-: ${COPY_MODS_DEST:="/data/mods"}
-
-if [ -d /mods ]; then
-  log "Copying any mods over..."
-  mkdir -p $COPY_MODS_DEST
-  rsync -a --out-format="update:%f:Last Modified %M" "${rsyncArgs[@]}" --prune-empty-dirs --update /mods/ $COPY_MODS_DEST
-fi
-
-: ${COPY_CONFIG_DEST:="/data/config"}
-
-if [ -d /config ]; then
-  log "Copying any configs from /config to $COPY_CONFIG_DEST"
-  mkdir -p $COPY_CONFIG_DEST
-  rsync -a --out-format="update:%f:Last Modified %M" "${rsyncArgs[@]}" --prune-empty-dirs --update /config/ $COPY_CONFIG_DEST
-fi
-
-exec ${SCRIPTS:-/}start-finalSetupServerProperties $@

start-finalSetupPlugins

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+. ${SCRIPTS:-/}start-utils
+
+: ${PLUGINS_SYNC_UPDATE:=true}
+
+isDebugging && set -x
+
+if [ -d /plugins ]; then
+  case ${TYPE} in
+    SPIGOT|BUKKIT|PAPER)
+      mkdir -p /data/plugins
+      log "Copying plugins over..."
+      if isTrue ${PLUGINS_SYNC_UPDATE}; then
+        updateArg="--update"
+      fi
+      # Copy plugins over using rsync to allow deeply nested updates of plugins
+      rsync -a --out-format="update:%f:Last Modified %M" --prune-empty-dirs $updateArg /plugins /data
+      ;;
+  esac
+fi
+
+exec ${SCRIPTS:-/}start-finalSetupServerProperties $@

start-finalSetupServerProperties

@@ -2,8 +2,6 @@
 
 . ${SCRIPTS:-/}start-utils
 
-: ${SERVER_PROPERTIES:=/data/server.properties}
-
 # FUNCTIONS
 function setServerProp {
   local prop=$1
@@ -14,15 +12,10 @@ function setServerProp {
       TRUE|FALSE)
         var=${var,,} ;;
     esac
-    if grep "${prop}" "$SERVER_PROPERTIES" > /dev/null; then
-      log "Setting ${prop} to '${var}' in ${SERVER_PROPERTIES}"
-      sed -i "/^${prop}\s*=/ c ${prop}=${var//\\/\\\\}" "$SERVER_PROPERTIES"
-    else
-      log "Adding ${prop} with '${var}' in ${SERVER_PROPERTIES}"
-      echo "${prop}=${var//\\/\\\\}" >> "$SERVER_PROPERTIES"
-    fi
+    log "Setting ${prop} to '${var}' in ${SERVER_PROPERTIES}"
+    sed -i "/^${prop}\s*=/ c ${prop}=${var}" "$SERVER_PROPERTIES"
   else
-    isDebugging && log "Skip setting ${prop}"
+    log "Skip setting ${prop}"
   fi
 }
 
@@ -31,10 +24,6 @@ function customizeServerProps {
     log "Creating whitelist"
     setServerProp "whitelist" "true"
     setServerProp "white-list" "true"
-  else
-    log "Disabling whitelist"
-    setServerProp "whitelist" "false"
-    setServerProp "white-list" "false"
   fi
 
   # If not provided, generate a reasonable default message-of-the-day,
@@ -80,7 +69,7 @@ function customizeServerProps {
   setServerProp "max-world-size" "$MAX_WORLD_SIZE"
   setServerProp "level-name" "$LEVEL"
   setServerProp "level-seed" "$SEED"
-  setServerProp "pvp" "${PVP}"
+  setServerProp "pvp" "$PVP"
   setServerProp "generator-settings" "$GENERATOR_SETTINGS"
   setServerProp "online-mode" "$ONLINE_MODE"
   setServerProp "allow-flight" "$ALLOW_FLIGHT"
@@ -181,8 +170,8 @@ function customizeServerProps {
 }
 
 # Deploy server.properties file
-if [[ ${TYPE} == "CURSEFORGE" ]]; then
-  export SERVER_PROPERTIES="${FTB_DIR}/server.properties"
+if [[ ${TYPE} == "FEED-THE-BEAST" ]]; then
+  export SERVER_PROPERTIES=${FTB_DIR}/server.properties
   log "detected FTB, changing properties path to ${SERVER_PROPERTIES}"
 fi
 
@@ -214,7 +203,7 @@ fi
 
 if isDebugging; then
   log "DEBUG Dumping server.properties"
-  cat "${SERVER_PROPERTIES}"
+  cat /data/server.properties
 fi
 
 exec ${SCRIPTS:-/}start-finalSetupEnvVariables $@

start-finalSetupWorld

@@ -4,23 +4,13 @@
 set -e
 isDebugging && set -x
 
-: ${LEVEL:=world}
-export LEVEL
-
-if [ $TYPE = "CURSEFORGE" ]; then
+if [ $TYPE = "FEED-THE-BEAST" ]; then
   worldDest=$FTB_DIR/$LEVEL
 else
   worldDest=/data/$LEVEL
 fi
 
 if [[ "$WORLD" ]] && ( isTrue "${FORCE_WORLD_COPY}" || [ ! -d "$worldDest" ] ); then
-  if isTrue "${FORCE_WORLD_COPY}"; then
-    log "Removing existing world data in $worldDest ${worldDest}_nether ${worldDest}_the_end"
-    rm -rf "$worldDest" \
-      "${worldDest}_nether" \
-      "${worldDest}_the_end"
-  fi
-
   if isURL $WORLD; then
     curl -fsSL "$WORLD" -o /tmp/world.zip
     zipSrc=/tmp/world.zip
@@ -35,12 +25,7 @@ if [[ "$WORLD" ]] && ( isTrue "${FORCE_WORLD_COPY}" || [ ! -d "$worldDest" ] );
     mkdir -p /tmp/world-data
     (cd /tmp/world-data && unzip -o -q "$zipSrc")
 
-    if [ "$TYPE" = "SPIGOT" ]; then
-      baseDirs=$(find /tmp/world-data -name "level.dat" -not -path "*_nether*" -not -path "*_the_end*" -exec dirname "{}" \;)
-    else
-      baseDirs=$(find /tmp/world-data -name "level.dat" -exec dirname "{}" \;)
-    fi
-
+    baseDirs=$(find /tmp/world-data -name "level.dat" -exec dirname "{}" \;)
     count=$(echo "$baseDirs" | wc -l)
     if [[ $count -gt 1 ]]; then
       baseDir="$(echo "$baseDirs" | sed -n ${WORLD_INDEX:-1}p)"
@@ -53,11 +38,6 @@ if [[ "$WORLD" ]] && ( isTrue "${FORCE_WORLD_COPY}" || [ ! -d "$worldDest" ] );
       exit 1
     fi
     rsync --remove-source-files --recursive --delete "$baseDir/" "$worldDest"
-    if [ "$TYPE" = "SPIGOT" ]; then
-      log "Copying end and nether ..."
-      [ -d "${baseDir}_nether" ] && rsync --remove-source-files --recursive --delete "${baseDir}_nether/" "${worldDest}_nether"
-      [ -d "${baseDir}_the_end" ] && rsync --remove-source-files --recursive --delete "${baseDir}_the_end/" "${worldDest}_the_end"
-    fi
   else
     log "Cloning world directory from $WORLD ..."
     rsync --recursive --delete "${WORLD%/}"/ "$worldDest"
@@ -66,8 +46,8 @@ if [[ "$WORLD" ]] && ( isTrue "${FORCE_WORLD_COPY}" || [ ! -d "$worldDest" ] );
   if [ "$TYPE" = "SPIGOT" ]; then
     # Reorganise if a Spigot server
     log "Moving End and Nether maps to Spigot location"
-    [ -d "$worldDest/DIM1" ] && mv -f "$worldDest/DIM1" "${worldDest}_the_end"
-    [ -d "$worldDest/DIM-1" ] && mv -f "$worldDest/DIM-1" "${worldDest}_nether"
+    [ -d "$worldDest/DIM1" ] && mv -f "$worldDest/DIM1" "/data/${LEVEL}_the_end"
+    [ -d "$worldDest/DIM-1" ] && mv -f "$worldDest/DIM-1" "/data/${LEVEL}_nether"
   fi
 fi
 

start-minecraftFinalSetup

@@ -1,53 +1,42 @@
 #!/bin/bash
 
 . ${SCRIPTS:-/}start-utils
-isDebugging && set -x
 
 if [ -n "$OPS" ]; then
-  log "Updating ops"
-  rm -f /data/ops.txt.converted
+  log "Setting/adding ops"
+  rm -rf /data/ops.txt.converted
   echo $OPS | awk -v RS=, '{print}' > /data/ops.txt
 fi
-if isTrue "${OVERRIDE_OPS}"; then
-  log "Recreating ops.json file at server startup"
-  rm -f /data/ops.json
-fi
 
 if [ -n "$WHITELIST" ]; then
-  log "Updating whitelist"
-  rm -f /data/white-list.txt.converted
+  log "Setting whitelist"
+  rm -rf /data/white-list.txt.converted
   echo $WHITELIST | awk -v RS=, '{print}' > /data/white-list.txt
 fi
-if isTrue "${OVERRIDE_WHITELIST}"; then
-  log "Recreating whitelist.json file at server startup"
-  rm -f /data/whitelist.json
-fi
 
-if [ -n "$ICON" ]; then
-    if [ ! -e server-icon.png ] || [ "${OVERRIDE_ICON}" == "TRUE" ]; then
-      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
-        log "Converting image to 64x64 PNG..."
-        convert /tmp/icon.img -resize 64x64! /data/server-icon.png
-      fi
-    fi
-fi
-
-if isTrue ${ENABLE_ROLLING_LOGS:-false}; then
-  # Set up log configuration
-  LOGFILE="/data/log4j2.xml"
-  if [ ! -e "$LOGFILE" ]; then
-    log "Creating log4j2.xml in ${LOGFILE}"
-    cp /tmp/log4j2.xml "$LOGFILE"
+if [ -n "$ICON" -a ! -e server-icon.png ]; then
+  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
-    log "log4j2.xml already created, skipping"
+    log "Converting image to 64x64 PNG..."
+    convert /tmp/icon.img -resize 64x64! /data/server-icon.png
   fi
-  JVM_OPTS="-Dlog4j.configurationFile=/data/log4j2.xml ${JVM_OPTS}"
+fi
+
+if ! isTrue ${SKIP_LOG4J_CONFIG}; then
+# 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}"
 fi
 
 # Make sure files exist and are valid JSON (for pre-1.12 to 1.12 upgrades)
@@ -60,14 +49,32 @@ for j in $JSON_FILES; do
   fi
 done
 
+
+# If any modules have been provided, copy them over
+if [ -d /mods ]; then
+  log "Copying any mods over..."
+  mkdir -p /data/mods
+  rsync -a --out-format="update:%f:Last Modified %M" --prune-empty-dirs --update /mods /data
+fi
+
+[ -d /data/config ] || mkdir /data/config
+for c in /config/*
+do
+  if [ -f "$c" ]; then
+    log Copying configuration $(basename "$c")
+    cp -rf "$c" /data/config
+  fi
+done
+
+EXTRA_ARGS=""
 # Optional disable console
 if versionLessThan 1.14 && [[ ${CONSOLE,,} = false ]]; then
-  EXTRA_ARGS+=" --noconsole"
+  EXTRA_ARGS+="--noconsole"
 fi
 
 # Optional disable GUI for headless servers
 if [[ ${GUI} = false || ${GUI} = FALSE ]]; then
-  EXTRA_ARGS+=" nogui"
+  EXTRA_ARGS="${EXTRA_ARGS} nogui"
 fi
 
 # put these prior JVM_OPTS at the end to give any memory settings there higher precedence
@@ -81,7 +88,25 @@ if [ -n "$JVM_DD_OPTS" ]; then
       done
 fi
 
+if isTrue ${TUNE_VIRTUALIZED}; then
+  JVM_XX_OPTS="${JVM_XX_OPTS} -Xtune:virtualized"
+fi
+
+if isTrue ${TUNE_NURSERY_SIZES}; then
+  case ${MAX_MEMORY^^} in
+    *G)
+      MAX_MEMORY_MB=$(( ${MAX_MEMORY%?} * 1024 )) ;;
+    *M)
+      MAX_MEMORY_MB=${MAX_MEMORY%?} ;;
+  esac
+
+  NURSERY_MINIMUM=$(( ${MAX_MEMORY_MB} / 2 ))
+  NURSERY_MAXIMUM=$(( ${MAX_MEMORY_MB} * 4/5 ))
+  JVM_XX_OPTS="${JVM_XX_OPTS} -Xmns${NURSERY_MINIMUM}M -Xmnx${NURSERY_MAXIMUM}M"
+fi
+
 if isTrue ${ENABLE_JMX}; then
+  : ${JMX_HOST:=0.0.0.0}
   : ${JMX_PORT:=7091}
   JVM_OPTS="${JVM_OPTS}
   -Dcom.sun.management.jmxremote.local.only=false
@@ -89,8 +114,8 @@ if isTrue ${ENABLE_JMX}; then
   -Dcom.sun.management.jmxremote.rmi.port=${JMX_PORT}
   -Dcom.sun.management.jmxremote.authenticate=false
   -Dcom.sun.management.jmxremote.ssl=false
-  -Dcom.sun.management.jmxremote.host=${JMX_BINDING:-0.0.0.0}
-  -Djava.rmi.server.hostname=${JMX_HOST:-localhost}"
+  -Dcom.sun.management.jmxremote.host=${JMX_HOST}
+  -Djava.rmi.server.hostname=${JMX_HOST}"
 
   log "JMX is enabled. Make sure you have port forwarding for ${JMX_PORT}"
 fi
@@ -144,82 +169,52 @@ if isTrue "${USE_LARGE_PAGES}"; then
   "
 fi
 
-if isTrue "${USE_FLARE_FLAGS}"; then
-  JVM_XX_OPTS="${JVM_XX_OPTS}
-  -XX:+UnlockDiagnosticVMOptions
-  -XX:+DebugNonSafepoints
-  "
-fi
-
 if isTrue "${DEBUG_MEMORY}"; then
   log "Memory usage and availability (in MB)"
   uname -a
   free -m
 fi
 
-JVM_OPTS="-Xms${INIT_MEMORY} -Xmx${MAX_MEMORY} ${JVM_OPTS}"
-
-function copyFilesForCurseForge() {
-  # copy player modification files unconditionally since their
-  # processing into json is additive anyway
-  [ -f /data/ops.txt ] && cp -f /data/ops.txt "${FTB_DIR}/"
-  [ -f /data/white-list.txt ] && cp -f /data/white-list.txt "${FTB_DIR}/"
-
-  if [ ! -e "${FTB_DIR}/server-icon.png" -a -e /data/server-icon.png ]; then
-    cp -f /data/server-icon.png "${FTB_DIR}/"
-  fi
-
-  cp -f /data/eula.txt "${FTB_DIR}/"
-}
-
-mcServerRunnerArgs="--stop-duration ${STOP_DURATION:-60}s"
+mcServerRunnerArgs="--stop-duration 60s"
 if [[ ${TYPE} == "CURSE_INSTANCE" ]]; then
+    JVM_OPTS="-Xms${INIT_MEMORY} -Xmx${MAX_MEMORY} ${JVM_OPTS}"
     if isTrue ${DEBUG_EXEC}; then
       set -x
     fi
     exec mc-server-runner ${mcServerRunnerArgs} \
       --cf-instance-file "${CURSE_INSTANCE_JSON}" \
       java $JVM_XX_OPTS $JVM_OPTS $expandedDOpts -jar _SERVERJAR_ "$@" $EXTRA_ARGS
-elif [[ ${TYPE} == "CURSEFORGE" && "${SERVER}" ]]; then
-  copyFilesForCurseForge
+elif [[ ${TYPE} == "FEED-THE-BEAST" ]]; then
+    mcServerRunnerArgs="${mcServerRunnerArgs} --shell bash"
 
-  cd "${FTB_DIR}"
-  log "Starting CurseForge server in ${FTB_DIR}..."
-  if isTrue ${DEBUG_EXEC}; then
-    set -x
-  fi
-  exec mc-server-runner ${bootstrapArgs} ${mcServerRunnerArgs} java $JVM_XX_OPTS $JVM_OPTS $expandedDOpts -jar $(basename "${SERVER}") "$@" $EXTRA_ARGS
-elif [[ ${TYPE} == "CURSEFORGE" ]]; then
-  mcServerRunnerArgs="${mcServerRunnerArgs} --shell bash"
+    # copy player modification files unconditionally since their
+    # processing into json is additive anyway
+    [ -f /data/ops.txt ] && cp -f /data/ops.txt ${FTB_DIR}/
+    [ -f /data/white-list.txt ] && cp -f /data/white-list.txt ${FTB_DIR}/
 
-  copyFilesForCurseForge
+    if [ ! -e "${FTB_DIR}/server-icon.png" -a -e /data/server-icon.png ]; then
+      cp -f /data/server-icon.png ${FTB_DIR}/
+    fi
 
-  cat > "${FTB_DIR}/settings-local.sh" <<EOF
+    cp -f /data/eula.txt "${FTB_DIR}/"
+
+    cat > "${FTB_DIR}/settings-local.sh" <<EOF
 export MIN_RAM="${INIT_MEMORY}"
 export MAX_RAM="${MAX_MEMORY}"
 export JAVA_PARAMETERS="${JVM_XX_OPTS} -Xms${INIT_MEMORY} ${JVM_OPTS} $expandedDOpts"
 EOF
 
-  # patch CurseForge cfg file, if present
-  if [ -f "${FTB_DIR}/settings.cfg" ]; then
-    sed -i "s/MAX_RAM=[^;]*/MAX_RAM=${MAX_MEMORY}/" "${FTB_DIR}/settings.cfg"
-  fi
+    # patch CurseForge cfg file, if present
+    if [ -f "${FTB_DIR}/settings.cfg" ]; then
+      sed -i "s/MAX_RAM=[^;]*/MAX_RAM=${MAX_MEMORY}/" "${FTB_DIR}/settings.cfg"
+    fi
 
-  cd "${FTB_DIR}"
-  log "Running FTB ${FTB_SERVER_START} in ${FTB_DIR} ..."
-
-  finalArgs=(
-    "${FTB_SERVER_START}"
-  )
-
-  if isTrue ${DEBUG_EXEC}; then
-    set -x
-  fi
-  if isTrue ${EXEC_DIRECTLY:-false}; then
-    "${finalArgs[@]}"
-  else
-    exec mc-server-runner ${mcServerRunnerArgs} "${finalArgs[@]}"
-  fi
+    cd "${FTB_DIR}"
+    log "Running FTB ${FTB_SERVER_START} in ${FTB_DIR} ..."
+    if isTrue ${DEBUG_EXEC}; then
+      set -x
+    fi
+    exec mc-server-runner ${mcServerRunnerArgs} "${FTB_SERVER_START}"
 else
   # If we have a bootstrap.txt file... feed that in to the server stdin
   if [ -f /data/bootstrap.txt ]; then
@@ -227,22 +222,9 @@ else
   fi
 
   log "Starting the Minecraft server..."
-
-  finalArgs=(
-    $JVM_XX_OPTS
-    $JVM_OPTS
-    $expandedDOpts
-    -jar $SERVER
-    "$@" $EXTRA_ARGS
-  )
-
+  JVM_OPTS="-Xms${INIT_MEMORY} -Xmx${MAX_MEMORY} ${JVM_OPTS}"
   if isTrue ${DEBUG_EXEC}; then
     set -x
   fi
-
-  if isTrue ${EXEC_DIRECTLY:-false}; then
-    exec java "${finalArgs[@]}"
-  else
-    exec mc-server-runner ${bootstrapArgs} ${mcServerRunnerArgs} java "${finalArgs[@]}"
-  fi
+  exec mc-server-runner ${bootstrapArgs} ${mcServerRunnerArgs} java $JVM_XX_OPTS $JVM_OPTS $expandedDOpts -jar $SERVER "$@" $EXTRA_ARGS
 fi

start-spiget

@@ -1,62 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-. ${SCRIPTS:-/}start-utils
-handleDebugMode
-
-: ${SPIGET_RESOURCES:=}
-
-containsJars() {
-  file=${1?}
-
-  pat='\.jar$'
-
-  while read -r line; do
-    if [[ $line =~ $pat ]]; then
-      return 0
-    fi
-  done <<<$(unzip -l "$file")
-
-  return 1
-}
-
-getResourceFromSpiget() {
-  resource=${1?}
-
-  log "Downloading resource ${resource} ..."
-
-  tmpfile="/tmp/${resource}.zip"
-  url="https://api.spiget.org/v2/resources/${resource}/download"
-  if ! curl -o "${tmpfile}" -fsSL -H "User-Agent: itzg/minecraft-server" "${extraCurlArgs[@]}" "${url}"; then
-    log "ERROR failed to download resource '${resource}' from ${url}"
-    exit 2
-  fi
-
-  mkdir -p /data/plugins
-  if containsJars "${tmpfile}"; then
-    log "Extracting contents of resource ${resource} into plugins"
-    unzip -o -q -d /data/plugins "${tmpfile}"
-    rm "${tmpfile}"
-  else
-    log "Moving resource ${resource} into plugins"
-    mv "${tmpfile}" "/data/plugins/${resource}.jar"
-  fi
-
-}
-
-if [[ ${SPIGET_RESOURCES} ]]; then
-  if isTrue ${REMOVE_OLD_MODS:-false}; then
-    removeOldMods /data/plugins
-    REMOVE_OLD_MODS=false
-  fi
-
-  log "Getting plugins via Spiget"
-  IFS=',' read -r -a resources <<<"${SPIGET_RESOURCES}"
-  for resource in "${resources[@]}"; do
-    getResourceFromSpiget "${resource}"
-  done
-fi
-
-# Continue to Final Setup
-exec ${SCRIPTS:-/}start-finalSetupWorld $@

start-utils

@@ -1,138 +1,101 @@
 #!/bin/bash
 
-function join_by() {
-  local d=$1
-  shift
-  echo -n "$1"
-  shift
-  printf "%s" "${@/#/$d}"
-}
+function join_by { local d=$1; shift; echo -n "$1"; shift; printf "%s" "${@/#/$d}"; }
 
-function isURL() {
+function isURL {
   local value=$1
 
-  if [[ ${value:0:8} == "https://" || ${value:0:7} == "http://" || ${value:0:6} == "ftp://" ]]; then
+  if [[ ${value:0:8} == "https://" || ${value:0:7} == "http://" ]]; then
     return 0
   else
     return 1
   fi
 }
 
-function isValidFileURL() {
-  suffix=${1:?Missing required suffix arg}
-  url=${2:?Missing required url arg}
-
-  [[ "$url" == http*://*.${suffix} || "$url" == http*://*.${suffix}\?* ]]
-}
-
-function resolveEffectiveUrl() {
-  url="${1:?Missing required url argument}"
-  if ! curl -Ls -o /dev/null -w %{url_effective} "$url"; then
-    log "ERROR failed to resolve effective URL from $url"
-    exit 2
-  fi
-}
-
-function getFilenameFromUrl() {
-  url="${1:?Missing required url argument}"
-  strippedOfQuery="${url%\?*}"
-  basename "$strippedOfQuery"
-}
-
-function isTrue() {
+function isTrue {
   local value=${1,,}
 
   result=
 
   case ${value} in
-  true | on)
-    result=0
-    ;;
-  *)
-    result=1
-    ;;
+    true|on)
+      result=0
+      ;;
+    *)
+      result=1
+      ;;
   esac
 
   return ${result}
 }
 
-function isDebugging() {
-  if isTrue "${DEBUG:-false}"; then
+function isDebugging {
+  if [[ -v DEBUG ]] && [[ ${DEBUG^^} = TRUE ]]; then
     return 0
   else
     return 1
   fi
 }
 
-function handleDebugMode() {
-  if isDebugging; then
-    set -x
-    extraCurlArgs=(-v)
-  fi
-}
-
-function debug() {
+function debug {
   if isDebugging; then
     log "DEBUG: $*"
   fi
 }
 
-function logn() {
+function logn {
   echo -n "[init] $*"
 }
 
-function log() {
+function log {
   echo "[init] $*"
 }
 
-function logAutopause() {
+function logAutopause {
   echo "[Autopause loop] $*"
 }
 
-function logAutopauseAction() {
+function logAutopauseAction {
   echo "[$(date -Iseconds)] [Autopause] $*"
 }
 
-function normalizeMemSize() {
+function normalizeMemSize {
   local scale=1
   case ${1,,} in
-  *k)
-    scale=1024
-    ;;
-  *m)
-    scale=1048576
-    ;;
-  *g)
-    scale=1073741824
-    ;;
+    *k)
+      scale=1024;;
+    *m)
+      scale=1048576;;
+    *g)
+      scale=1073741824;;
   esac
 
-  val=${1:0:-1}
-  echo $((val * scale))
+  val=${1:0: -1}
+  echo $(( val * scale ))
 }
 
-function versionLessThan() {
+function versionLessThan {
   local activeParts
-  IFS=. read -ra activeParts <<<"${VANILLA_VERSION}"
+  IFS=. read -ra activeParts <<< "${VANILLA_VERSION}"
 
   local givenParts
-  IFS=. read -ra givenParts <<<"$1"
+  IFS=. read -ra givenParts <<< "$1"
 
-  if ((${#activeParts[@]} < 2)); then
+  if (( ${#activeParts[@]} < 2 )); then
     return 1
   fi
 
-  if ((${#activeParts[@]} == 2)); then
-    if ((activeParts[0] < givenParts[0])) ||
-      ((activeParts[0] == givenParts[0] && activeParts[1] < givenParts[1])); then
+  if (( ${#activeParts[@]} == 2 )); then
+    if (( activeParts[0] < givenParts[0] )) || \
+      (( activeParts[0] == givenParts[0] && activeParts[1] < givenParts[1] )); then
       return 0
     else
       return 1
     fi
   else
-    if ((activeParts[0] < givenParts[0])) ||
-      ((activeParts[0] == givenParts[0] && activeParts[1] < givenParts[1])) ||
-      ((activeParts[0] == givenParts[0] && activeParts[1] == givenParts[1] && activeParts[2] < givenParts[2])); then
+    if (( activeParts[0] < givenParts[0] )) || \
+      (( activeParts[0] == givenParts[0] && activeParts[1] < givenParts[1] )) || \
+      (( activeParts[0] == givenParts[0] && activeParts[1] == givenParts[1] && activeParts[2] < givenParts[2] )); then
       return 0
     else
       return 1
@@ -145,38 +108,4 @@ requireVar() {
     log "ERROR: $1 is required to be set"
     exit 1
   fi
-  if [ -z "${!1}" ]; then
-    log "ERROR: $1 is required to be set"
-    exit 1
-  fi
-}
-
-requireEnum() {
-  var=${1?}
-  shift
-
-  for allowed in $*; do
-    if [[ ${!var} = $allowed ]]; then
-      return 0
-    fi
-  done
-
-  log "ERROR: $var must be set to one of $@"
-#  exit 1
-}
-
-function writeEula() {
-  if ! echo "# Generated via Docker
-# $(date)
-eula=${EULA,,}
-" >/data/eula.txt; then
-    log "ERROR: unable to write eula to /data. Please make sure attached directory is writable by uid=${UID}"
-    exit 2
-  fi
-}
-
-function removeOldMods {
-  if [ -d "$1" ]; then
-    find "$1" -mindepth 1 -maxdepth ${REMOVE_OLD_MODS_DEPTH:-16} -wholename "${REMOVE_OLD_MODS_INCLUDE:-*}" -not -wholename "${REMOVE_OLD_MODS_EXCLUDE}" -delete
-  fi
 }