From ca0f5333104a3054d7d3ee006f8e0a9a35515145 Mon Sep 17 00:00:00 2001
From: mitch weaver <mitch@wvr.sh>
Date: Thu, 8 Dec 2022 00:40:29 -0800
Subject: [PATCH] bug fixes

---
 start.sh | 37 ++++++++++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/start.sh b/start.sh
index 0c876b8..ebb16d8 100755
--- a/start.sh
+++ b/start.sh
@@ -60,7 +60,7 @@ check() {
     if [ ! -d "$MAIN" ] ; then
         die "$MAIN does not exist"
     fi
-    
+
     if [ ! -d "$STOCK_SERVER_DATA" ] ; then
         die "$STOCK_SERVER_DATA does not exist"
     fi
@@ -83,16 +83,16 @@ setup_environment() {
     done
 
     # list of all stock files
-    for file in ban.txt dayz.gproj dayzsetting.xml serverDZ.cfg whitelist.txt \
+    for file in ban.txt dayz.gproj dayzsetting.xml whitelist.txt \
         DayZServer_x64.exe steam_api64.dll steamclient64.dll tier0_s64.dll vstdlib_s64.dll ; do
-        do_sync "$STOCK_SERVER_DATA/$file" "$SERVER_HOME/$file" || die "Failed to copy stock: $file"
+        cp -f "$STOCK_SERVER_DATA/$file" "$SERVER_HOME/$file" || die "Failed to copy stock: $file"
     done
 
     msg "Copying mod files"
     do_sync "$DAYZ_FILES/mods/$MAP_FOLDER_NAME"/ "$MOD_CACHE/$MAP_FOLDER_NAME" || die "Failed to copy mod files"
 
     msg "Copying DZSA executable"
-    do_sync "$DAYZ_FILES/software/DZSALModServer.exe" "$SERVER_HOME/DZSALModServer.exe"
+    cp -f "$DAYZ_FILES/software/DZSALModServer.exe" "$SERVER_HOME/"
 }
 
 # -*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
@@ -117,7 +117,7 @@ load_mods() {
                     if [ -d "$SERVER_HOME/mods/$mod/$addon_folder" ] ; then
                         for addon in "$SERVER_HOME/mods/$mod/$addon_folder"/* ; do
                             if [ ! -f "$SERVER_HOME/addons/${addon##*/}" ] ; then
-                                do_sync "$addon" "$SERVER_HOME/addons/${addon##*/}"
+                                cp -f "$addon" "$SERVER_HOME/addons/"
                             fi
                         done
                     fi
@@ -127,7 +127,7 @@ load_mods() {
                     if [ -d "$SERVER_HOME/mods/$mod/$key_folder" ] ; then
                         for key in "$SERVER_HOME/mods/$mod/$key_folder"/* ; do
                             if [ ! -f "$SERVER_HOME/keys/${key##*/}" ] ; then
-                                do_sync "$key" "$SERVER_HOME/keys/${key##*/}"
+                                cp -f "$key" "$SERVER_HOME/keys/"
                             fi
                         done
                     fi
@@ -144,7 +144,7 @@ load_mods() {
 # Load Map
 # -*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
 load_stock_map_data() {
-    msg "Loading stock map data"
+    mkdir -p "$SERVER_HOME/mpmissions/$MAP_FOLDER_NAME"
     do_sync --exclude="*storage_1*" \
         "$DAYZ_FILES/stock/maps/$MAP_FOLDER_NAME"/ \
         "$SERVER_HOME/mpmissions/$MAP_FOLDER_NAME"
@@ -255,6 +255,14 @@ load_configs() {
             fi
         done
     fi
+
+    msg "Copying generic Profilesfolder configs"
+    if [ -d "$DAYZ_FILES/server_configs/Profilesfolder/sUDE/config" ] ; then
+        mkdir -p "$SERVER_HOME/Profilesfolder/sUDE/config"
+        cp -f "$DAYZ_FILES/server_configs/Profilesfolder/sUDE/config"/* "$SERVER_HOME/Profilesfolder/sUDE/config"/
+    else
+        die "missing: $DAYZ_FILES/server_configs/Profilesfolder/sUDE/config"
+    fi
 }
 
 # -*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
@@ -292,7 +300,7 @@ main() {
 # creating temp.bat here to avoid the arg max char limit of windows cmd.exe
 cat > temp.bat <<EOF
 :start
-start "DayZ Server" /min DZSALModServer.exe -config="$SERVER_CONFIG_FILE" -port="$SERVER_PORT" -profiles=Profilesfolder -mod="$mod_string" -cpuCount="$SERVER_CPU" -dologs -adminlog -netlog -freezecheck
+start "DayZ Server" /min DZSALModServer.exe -config=serverDZ.cfg -port="$SERVER_PORT" -profiles=Profilesfolder -mod="$mod_string" -cpuCount="$SERVER_CPU" -dologs -adminlog -netlog -freezecheck
 EOF
     cmd.exe /C temp.bat
 
@@ -316,11 +324,22 @@ EOF
     msg "SERVER IS RESTARTING"
 }
 
+ORIGINAL_DIR="$PWD"
+
 while msg 'Starting loop' ; do
-    if [ -f ./SERVER.ENV ] ; then
+    cd "$ORIGINAL_DIR" || die "Can no longer cd to $ORIGINAL_DIR"
+
+    if [ -e ./SERVER.ENV ] ; then
         . ./SERVER.ENV
     else
         die "Could not source ./SERVER.ENV"
     fi
+
+    if [ -f ./serverDZ.cfg ] ; then
+        cp -f ./serverDZ.cfg "$SERVER_HOME"/
+    else
+        die "Could not find ./serverDZ.cfg"
+    fi
+
     main "$@"
 done