From 9ecb95f5effcb3a48446c0905c5351241c17c567 Mon Sep 17 00:00:00 2001
From: Danielle Voznyy <dan.voznyy@gmail.com>
Date: Tue, 28 May 2024 11:54:10 -0400
Subject: [PATCH] fix: Set KEEPUP_JSON_PATH correctly

---
 scripts/dev/keepup | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/scripts/dev/keepup b/scripts/dev/keepup
index 27f62f1..768da33 100644
--- a/scripts/dev/keepup
+++ b/scripts/dev/keepup
@@ -3,7 +3,7 @@ set -e
 
 keepupDir=$HOME/keepupDir
 keepupDownloadsDir=$keepupDir/downloads
-keepupOverridesFile=$keepupDir/overrides.conf
+#keepupOverridesFile=$keepupDir/overrides.conf
 pluginsDir=$HOME/plugins
 configSource=/server-config/
 pluginVersionsFile=/server-config/keepup/plugins.conf
@@ -13,10 +13,23 @@ mkdir -p "$keepupDownloadsDir"
 mkdir -p "$pluginsDir"
 
 if [ "$KEEPUP" = "true" ]; then
+#    if [ ! -f "$keepupOverridesFile" ]; then
+#      echo "Creating default keepup overrides file"
+#      touch "$keepupOverridesFile"
+#    fi
+
+    if [ ! -f "$pluginVersionsFile" ]; then
+          echo "Plugin versions file not found at $pluginVersionsFile, skipping keepup"
+          return
+    fi
+
+    if [ -z "$KEEPUP_JSON_PATH" ]; then
+      export KEEPUP_JSON_PATH=mineinabyss.servers.${SERVER_NAME}
+    fi
+
   echo "Keepup enabled"
   keepup plugins $pluginVersionsFile $keepupDownloadsDir $pluginsDir --hide-progress-bar \
     config --source $configSource --dest $HOME --inventory $keepupDir/keepup-configs.yml --template-cache $keepupDir/templates survival
-#  fi
 else
   echo "KEEPUP is not set to 'true', not running keepup"
 fi