From 71604d9b0bd7b047b7fab7b4317eab6e508c504e Mon Sep 17 00:00:00 2001
From: dreamforceinc <dreamforce@yandex.ru>
Date: Fri, 29 Nov 2024 22:23:21 +0300
Subject: [PATCH] Added check for profiles location.

---
 wDayzManager.ini | 111 +++++++++++++++++++++++------------------------
 wDayzManager.ps1 |  21 +++++++--
 2 files changed, 73 insertions(+), 59 deletions(-)

diff --git a/wDayzManager.ini b/wDayzManager.ini
index 4c6c1a9..f539467 100644
--- a/wDayzManager.ini
+++ b/wDayzManager.ini
@@ -1,22 +1,22 @@
 ; wDayzManager.ini
 [Config]
-;serverLocation=Z:\Servers\dayzserver
-serverLocation=D:\dayz\server
+serverLocation=Z:\Servers\dayzserver
+; serverLocation=D:\dayz\server
 profilesLocation=profiles
-; steamCMD=Z:\SteamCMD
-steamCMD=V:\SteamCMD
+steamCMD=Z:\SteamCMD
+; steamCMD=V:\SteamCMD
 steamUser=w0lf_2k
 appidGame=221100
 appidServer=223350
 rotateLogs=0
 daysAmount=7
-; rotatedLogsFolderName=RotatedLogs
-rotatedLogsFolderName=
-; becFolderName=BEC
-becFolderName=
-; atFolderName=VPPAdminTools
+rotatedLogsFolderName=RotatedLogs
+; rotatedLogsFolderName=
+becFolderName=BEC
+; becFolderName=
+atFolderName=VPPAdminTools
 ; atFolderName=CommunityOnlineTools
-atFolderName=
+; atFolderName=
 
 ; Server updating settings:
 ; D = Daily - Updates are checked daily at the hours specified in parameter 'updateHour' (0 - 23). In this case, parameter 'updateDay' is ignored.
@@ -47,56 +47,55 @@ updateHour=4
 [ServerMods]
 @SurvivorMissions=1988925918
 
-; [Server-1]
-; serverPort=35100
-; serverConfig=serverDZ.cfg
-; serverExeName=DayZServer_x64.exe
-; serverCPU=2
-; startupClientMods=@CF;@VPPadminTools
-; startupServerMods=
-; additionalParams= -name=Server -adminLog
-; namalskMission=
-
-; [Server-2]
-; serverPort=35200
-; serverConfig=serverDZ.cfg
-; serverExeName=DayZServer_x64.exe
-; serverCPU=2
-; startupClientMods=@CF;@VPPadminTools
-; startupServerMods=
-; additionalParams= -name=Server -adminLog
-; namalskMission=
-
-; [Server-3]
-; serverPort=35300
-; serverConfig=serverDZ.cfg
-; serverExeName=DayZServer_x64.exe
-; serverCPU=2
-; startupClientMods=@CF;@VPPadminTools;@Namalsk_Island;@Namalsk_Survival
-; startupServerMods=
-; additionalParams= -name=Server -adminLog
-; namalskMission=Regular
-
-; [Server-4]
-; serverPort=35400
-; serverConfig=serverDZ.cfg
-; serverExeName=DayZServer_x64.exe
-; serverCPU=2
-; startupClientMods=@CF;@VPPadminTools
-; startupServerMods=
-; additionalParams= -name=Server -adminLog
-; namalskMission=
-
-[Server-5]
-serverPort=35500
+[Server-1]
+serverPort=35100
 serverConfig=serverDZ.cfg
 serverExeName=DayZServer_x64.exe
 serverCPU=2
-startupClientMods=
-; startupClientMods=@CF;@VPPAdminTools;@Namalsk_Island;@Namalsk_Survival
+startupClientMods=@CF;@VPPadminTools
 startupServerMods=
-additionalParams= -name=Server
-namalskMission=Hardcore
+additionalParams= -name=Server -adminLog
+namalskMission=
+
+[Server-2]
+serverPort=35200
+serverConfig=serverDZ.cfg
+serverExeName=DayZServer_x64.exe
+serverCPU=2
+startupClientMods=@CF;@VPPadminTools
+startupServerMods=
+additionalParams= -name=Server -adminLog
+namalskMission=
+
+[Server-3]
+serverPort=35300
+serverConfig=serverDZ.cfg
+serverExeName=DayZServer_x64.exe
+serverCPU=2
+startupClientMods=@CF;@VPPadminTools;@Namalsk_Island;@Namalsk_Survival
+startupServerMods=
+additionalParams= -name=Server -adminLog
+namalskMission=Regular
+
+[Server-4]
+serverPort=35400
+serverConfig=serverDZ.cfg
+serverExeName=DayZServer_x64.exe
+serverCPU=2
+startupClientMods=@CF;@VPPadminTools
+startupServerMods=
+additionalParams= -name=Server -adminLog
+namalskMission=
+
+; [Server-5]
+; serverPort=35500
+; serverConfig=serverDZ.cfg
+; serverExeName=DayZServer_x64.exe
+; serverCPU=2
+; startupClientMods=
+; startupServerMods=
+; additionalParams= -name=Server
+; namalskMission=Hardcore
 
 ; [Server-6]
 ; serverPort=35600
diff --git a/wDayzManager.ps1 b/wDayzManager.ps1
index 5705cf9..e107430 100644
--- a/wDayzManager.ps1
+++ b/wDayzManager.ps1
@@ -253,8 +253,6 @@ if ($becLocation) {
     $becProcess = [Object[]]::new($servers.Count)
 }
 
-EXIT
-
 foreach ($srv in $servers) {
     $instance = ${srv}
     $serverPort = $ini.${srv}.serverPort
@@ -283,7 +281,16 @@ foreach ($srv in $servers) {
         }
     }
 
-    $serverProfile = "$($serverLocation)\profiles\$($instance)"
+    # Checks for profile location
+    if ([System.IO.Path]::IsPathRooted($profilesLocation)) {
+        $serverProfile = "$($profilesLocation)\$($instance)"
+    }
+    else {
+        $serverProfile = "$($serverLocation)\$($profilesLocation)\$($instance)"
+    }
+    $serverProfile = [System.IO.Path]::GetFullPath($serverProfile)
+    Write-Host "serverProfile: $($serverProfile)"
+
     $startupMods = @("`"-mod=$($startupClientMods)`"", "`"-serverMod=$($startupServerMods)`"")
     $startupParams = @("`"-profiles=$($serverProfile)`"", "`"-config=$($serverProfile)\$($serverConfig)`"", "-port=$($serverPort)", "-cpuCount=$($serverCPU)")
     $dayzArguments = $startupParams + $startupMods + $additionalParams
@@ -431,6 +438,14 @@ foreach ($srv in $servers) {
             Write-Host
         }
         #endregion
+
+        #region ### wDayzManager ###
+
+        #endregion
+
+        #region ### Dayz stats logs ###
+
+        #endregion
     }
 
     # Write-Host "             instance: $($instance)"