From 345696227d7cfb13a300c1cdd70a90d0ef41a457 Mon Sep 17 00:00:00 2001
From: Dirk Gustke <code+github@asm68k.org>
Date: Tue, 6 Feb 2018 21:21:23 +0100
Subject: [PATCH 1/2] test for the correct files at the correct locations

---
 minecraft-server/start-minecraftFinalSetup | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/minecraft-server/start-minecraftFinalSetup b/minecraft-server/start-minecraftFinalSetup
index c15865c5..d914fefe 100755
--- a/minecraft-server/start-minecraftFinalSetup
+++ b/minecraft-server/start-minecraftFinalSetup
@@ -77,7 +77,18 @@ echo "Setting initial memory to ${INIT_MEMORY:-${MEMORY}} and max to ${MAX_MEMOR
 JVM_OPTS="-Xms${INIT_MEMORY:-${MEMORY}} -Xmx${MAX_MEMORY:-${MEMORY}} ${JVM_OPTS}"
 
 if [[ ${TYPE} == "FEED-THE-BEAST" ]]; then
-    cp -f /data/{eula,ops,white-list}.txt ${FTB_DIR}/
+    if [ ! -e ${FTB_DIR}/ops.json ]; then
+      cp -f /data/ops.txt ${FTB_DIR}/
+    fi
+
+    if [ ! -e ${FTBDIR}/whitelist.json ]; then
+      cp -f ${FTB_DIR}/white-list.txt ${FTB_DIR}/
+    fi
+
+    if [ ! -e ${FTB_DIR}/eula.txt ]; then
+      cp -f /data/eula.txt ${FTB_DIR}/
+    fi
+
     cd ${FTB_DIR}
     echo "Running FTB server modpack start ..."
     exec ${FTB_SERVER_START}

From b8e996d3c425a8e91e19d3f02fddbe70b3ab190c Mon Sep 17 00:00:00 2001
From: Dirk Gustke <code+github@asm68k.org>
Date: Tue, 6 Feb 2018 23:55:44 +0100
Subject: [PATCH 2/2] typo

---
 minecraft-server/start-minecraftFinalSetup | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/minecraft-server/start-minecraftFinalSetup b/minecraft-server/start-minecraftFinalSetup
index d914fefe..a353249f 100755
--- a/minecraft-server/start-minecraftFinalSetup
+++ b/minecraft-server/start-minecraftFinalSetup
@@ -81,7 +81,7 @@ if [[ ${TYPE} == "FEED-THE-BEAST" ]]; then
       cp -f /data/ops.txt ${FTB_DIR}/
     fi
 
-    if [ ! -e ${FTBDIR}/whitelist.json ]; then
+    if [ ! -e ${FTB_DIR}/whitelist.json ]; then
       cp -f ${FTB_DIR}/white-list.txt ${FTB_DIR}/
     fi