From 29626671e991883db4504cfafed47b64464b66b9 Mon Sep 17 00:00:00 2001 From: Mitch Weaver Date: Sat, 25 Nov 2023 08:26:03 -0600 Subject: [PATCH] a --- lib/globals.sh | 2 -- server_start.sh | 9 +-------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/lib/globals.sh b/lib/globals.sh index 86909b4..ff09436 100644 --- a/lib/globals.sh +++ b/lib/globals.sh @@ -154,5 +154,3 @@ unlock_remote_server() { rm -f "$REMOTE_SERVER_LOCKFILE" || die "Could not remove: $REMOTE_SERVER_LOCKFILE" } # ===================================================================================== -################### GLOBAL FUNCTIONS ######################### - diff --git a/server_start.sh b/server_start.sh index 4680d80..7897ec0 100644 --- a/server_start.sh +++ b/server_start.sh @@ -94,18 +94,14 @@ init_server() { refresh_local_cache() { msg "Refreshing local stock server cache" if ! islocked_remote_server ; then - lock_remote_server do_sync "$REMOTE_STOCK_SERVER"/ "$STOCK_SERVER_CACHE" - unlock_remote_server else msg "Remote server is locked, sleeping..." while islocked_remote_server ; do sleep 15 echo 'Sleeping...' done - lock_remote_server do_sync "$REMOTE_STOCK_SERVER"/ "$STOCK_SERVER_CACHE" - unlock_remote_server fi msg "Stock server data copied into local server cache!" @@ -113,18 +109,14 @@ refresh_local_cache() { msg "Refreshing local mods cache" if ! islocked_remote_server ; then - lock_remote_server do_sync "$REMOTE_MODS"/ "$MOD_CACHE" - unlock_remote_server else msg "Remote server is locked, sleeping..." while islocked_remote_server ; do sleep 15 echo 'Sleeping...' done - lock_remote_server do_sync "$REMOTE_MODS"/ "$MOD_CACHE" - unlock_remote_server fi msg "Mods data copied into local mod cache!" } @@ -205,6 +197,7 @@ main() { # load stock server, map, mod files into $SERVER_HOME setup_environment || die "Failed to setup environment." + # START THE SERVER - RUN ServerDZ.EXE start_server "$@" }