From a2132292ac90ae49f5a64a19106cd8bc7e83f877 Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Thu, 18 Mar 2021 20:00:30 -0500
Subject: [PATCH] Separated OVERRIDE_OPS|WHITELIST from OPS|WHITELIST logic
 #806

---
 start-minecraftFinalSetup | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/start-minecraftFinalSetup b/start-minecraftFinalSetup
index fc3cfa1d..36b349a9 100644
--- a/start-minecraftFinalSetup
+++ b/start-minecraftFinalSetup
@@ -7,22 +7,20 @@ if [ -n "$OPS" ]; then
   log "Updating ops"
   rm -f /data/ops.txt.converted
   echo $OPS | awk -v RS=, '{print}' > /data/ops.txt
-
-  if isTrue "${OVERRIDE_OPS}"; then
-    log "Recreating ops.json file at server startup"
-    rm -f /data/ops.json
-  fi
+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
   echo $WHITELIST | awk -v RS=, '{print}' > /data/white-list.txt
-
-  if isTrue "${OVERRIDE_WHITELIST}"; then
-    log "Recreating whitelist.json file at server startup"
-    rm -f /data/whitelist.json
-  fi
+fi
+if isTrue "${OVERRIDE_WHITELIST}"; then
+  log "Recreating whitelist.json file at server startup"
+  rm -f /data/whitelist.json
 fi
 
 if [ -n "$ICON" ]; then