test3

pkashin · May 21, 2023 · fc1ef07 · fc1ef07
1 parent c19bb3d
commit fc1ef07
Show file tree

Hide file tree

Showing 4 changed files with 70 additions and 54 deletions.
diff --git a/control/start.bat b/control/start.bat
@@ -0,0 +1,53 @@
+taskkill /pid IcarusServer-Win64-Shipping.exe
+cd "C:\Icarus\Control"
+for /f "tokens=2 delims==" %%i in ('findstr ServerName Settings.ini') do set ServerName=%%i
+for /f "tokens=2 delims==" %%i in ('findstr JoinPassword Settings.ini') do set JoinPassword2=%%i
+for /f "tokens=2 delims==" %%i in ('findstr AdminPassword Settings.ini') do set AdminPassword2=%%i
+if not exist "C:\Icarus\Icarus\Saved\Config\WindowsServer\ServerSettings.ini" (
+    mkdir "C:\Icarus\Icarus\Saved\Config\WindowsServer"
+    cd "C:\Icarus\Icarus\Saved\Config\WindowsServer"
+    echo [/Script/Icarus.DedicatedServerSettings] > ServerSettings.ini
+    echo SessionName= >> ServerSettings.ini
+    echo JoinPassword=%JoinPassword2% >> ServerSettings.ini
+    echo MaxPlayers=8 >> ServerSettings.ini
+    echo ShutdownIfNotJoinedFor=300.000000 >> ServerSettings.ini
+    echo ShutdownIfEmptyFor=300.000000 >> ServerSettings.ini
+    echo AdminPassword=%AdminPassword2% >> ServerSettings.ini
+    echo LoadProspect= >> ServerSettings.ini
+    echo CreateProspect= >> ServerSettings.ini
+    echo ResumeProspect=True >> ServerSettings.ini
+    echo LastProspectName= >> ServerSettings.ini
+    echo AllowNonAdminsToLaunchProspects=True >> ServerSettings.ini
+    echo AllowNonAdminsToDeleteProspects=False >> ServerSettings.ini
+)
+cd "C:\Icarus\Icarus\Saved\Config\WindowsServer"
+for /f "tokens=2 delims==" %%i in ('findstr SessionName ServerSettings.ini') do set SessionName=%%i
+for /f "tokens=2 delims==" %%i in ('findstr JoinPassword ServerSettings.ini') do set JoinPassword=%%i
+for /f "tokens=2 delims==" %%i in ('findstr MaxPlayers ServerSettings.ini') do set MaxPlayers=%%i
+for /f "tokens=2 delims==" %%i in ('findstr ShutdownIfNotJoinedFor ServerSettings.ini') do set ShutdownIfNotJoinedFor=%%i
+for /f "tokens=2 delims==" %%i in ('findstr ShutdownIfEmptyFor ServerSettings.ini') do set ShutdownIfEmptyFor=%%i
+for /f "tokens=2 delims==" %%i in ('findstr AdminPassword ServerSettings.ini') do set AdminPassword=%%i
+for /f "tokens=2 delims==" %%i in ('findstr LoadProspect ServerSettings.ini') do set LoadProspect=%%i
+for /f "tokens=2 delims==" %%i in ('findstr CreateProspect ServerSettings.ini') do set CreateProspect=%%i
+for /f "tokens=2 delims==" %%i in ('findstr ResumeProspect ServerSettings.ini') do set ResumeProspect=%%i
+for /f "tokens=2 delims==" %%i in ('findstr LastProspectName ServerSettings.ini') do set LastProspectName=%%i
+for /f "tokens=2 delims==" %%i in ('findstr AllowNonAdminsToLaunchProspects ServerSettings.ini') do set AllowNonAdminsToLaunchProspects=%%i
+for /f "tokens=2 delims==" %%i in ('findstr AllowNonAdminsToDeleteProspects ServerSettings.ini') do set AllowNonAdminsToDeleteProspects=%%i
+if not (JoinPassword==%JoinPassword2% || AdminPassword==%AdminPassword2%) (
+    del ServerSettings.ini
+    echo [/Script/Icarus.DedicatedServerSettings] > ServerSettings.ini
+    echo SessionName=%SessionName% >> ServerSettings.ini
+    echo JoinPassword=%JoinPassword2% >> ServerSettings.ini
+    echo MaxPlayers=%MaxPlayers% >> ServerSettings.ini
+    echo ShutdownIfNotJoinedFor=%ShutdownIfNotJoinedFor% >> ServerSettings.ini
+    echo ShutdownIfEmptyFor=%ShutdownIfEmptyFor% >> ServerSettings.ini
+    echo AdminPassword=%AdminPassword2% >> ServerSettings.ini
+    echo LoadProspect=%LoadProspect% >> ServerSettings.ini
+    echo CreateProspect=%CreateProspect% >> ServerSettings.ini
+    echo ResumeProspect=%ResumeProspect% >> ServerSettings.ini
+    echo LastProspectName=%LastProspectName% >> ServerSettings.ini
+    echo AllowNonAdminsToLaunchProspects=%AllowNonAdminsToLaunchProspects% >> ServerSettings.ini
+    echo AllowNonAdminsToDeleteProspects=%AllowNonAdminsToDeleteProspects% >> ServerSettings.ini
+)
+
+start C:\Icarus\IcarusServer.exe -SteamServerName=%ServerName% -Port=17777 -QueryPort=27015 -Log
diff --git a/update.bat → control/update.bat b/update.bat → control/update.bat
@@ -1,3 +1,5 @@
 taskkill /pid IcarusServer-Win64-Shipping.exe
 cd "C:\steamcmd"
 steamcmd +login anonymous +force_install_dir "C:\Icarus" +app_update 2089300 validate +quit
+cd "C:\Icarus\Control"
+start.bat
diff --git a/install.bat b/install.bat
@@ -7,36 +7,24 @@ cd "C:\"
 mkdir "C:\Icarus\Control"
 cd /d "%~dp0"
 copy /y Settings.ini "C:\Icarus\Control\Settings.ini"
-
-echo creating the start.bat file to start the server
-cd "C:\Icarus\Control"
-echo taskkill /pid IcarusServer-Win64-Shipping.exe > "C:\Icarus\Control\start.bat"
-echo for /f "tokens=2 delims==" %%i in ('findstr ServerName Settings.ini') do set name=%%i >> "C:\Icarus\Control\start.bat"
-echo for /f "tokens=2 delims==" %%i in ('findstr JoinPassword Settings.ini') do set joinpassword=%%i >> "C:\Icarus\Control\start.bat"
-echo for /f "tokens=2 delims==" %%i in ('findstr AdminPassword Settings.ini') do set adminpassword=%%i >> "C:\Icarus\Control\start.bat"
-echo if not exist "C:\Icarus\Icarus\Saved\Config\WindowsServer\ServerSettings.ini" (echo [/Script/Icarus.DedicatedServerSettings] > "C:\Icarus\Icarus\Saved\Config\WindowsServer\ServerSettings.ini" & echo SessionName= >> "C:\Icarus\Icarus\Saved\Config\WindowsServer\ServerSettings.ini" & echo JoinPassword=%joinpassword% >> "C:\Icarus\Icarus\Saved\Config\WindowsServer\ServerSettings.ini" & echo MaxPlayers=8 >> "C:\Icarus\Icarus\Saved\Config\WindowsServer\ServerSettings.ini" & echo ShutdownIfNotJoinedFor=300.000000 >> "C:\Icarus\Icarus\Saved\Config\WindowsServer\ServerSettings.ini" & echo ShutdownIfEmptyFor=300.000000 >> "C:\Icarus\Icarus\Saved\Config\WindowsServer\ServerSettings.ini" & echo AdminPassword=%adminpassword% >> "C:\Icarus\Icarus\Saved\Config\WindowsServer\ServerSettings.ini" & echo LoadProspect= >> "C:\Icarus\Icarus\Saved\Config\WindowsServer\ServerSettings.ini" & echo CreateProspect= >> "C:\Icarus\Icarus\Saved\Config\WindowsServer\ServerSettings.ini" & echo ResumeProspect=True >> "C:\Icarus\Icarus\Saved\Config\WindowsServer\ServerSettings.ini" & echo LastProspectName= >> "C:\Icarus\Icarus\Saved\Config\WindowsServer\ServerSettings.ini" & echo AllowNonAdminsToLaunchProspects=True >> "C:\Icarus\Icarus\Saved\Config\WindowsServer\ServerSettings.ini" & echo AllowNonAdminsToDeleteProspects=False >> "C:\Icarus\Icarus\Saved\Config\WindowsServer\ServerSettings.ini") >> "C:\Icarus\Control\start.bat"
-::cd "C:\Icarus\Icarus\Saved\Config\WindowsServer"
-::echo for /f "tokens=2 delims==" %%i in ('findstr JoinPassword ServerSettings.ini') do set joinpassword2=%%i >> "C:\Icarus\Control\start.bat"
-::echo for /f "tokens=2 delims==" %%i in ('findstr AdminPassword ServerSettings.ini') do set adminpassword2=%%i >> "C:\Icarus\Control\start.bat"
-::echo if not "%joinpassword%"=="%joinpassword2%" (echo JoinPassword=%joinpassword% >> "C:\Icarus\Icarus\Saved\Config\WindowsServer\ServerSettings.ini") >> "C:\Icarus\Control\start.bat"
-:: изменить значение параметра JoinPassword в файле ServerSettings.ini
-
-
-echo start C:\Icarus\IcarusServer.exe -SteamServerName="%name%" -Port=17777 -QueryPort=27015 -Log >> "C:\Icarus\Control\start.bat"
-
-echo creating the update.bat file to update the server
-echo taskkill /pid IcarusServer-Win64-Shipping.exe > "C:\Icarus\Control\update.bat"
-echo cd "C:\steamcmd" >> "C:\Icarus\Control\update.bat"
-echo steamcmd +login anonymous +force_install_dir "C:\Icarus" +app_update 2089300 validate +quit >> "C:\Icarus\Control\update.bat"
-echo cd "C:\Icarus\Control" >> "C:\Icarus\Control\update.bat"
-echo start.bat >> "C:\Icarus\Control\update.bat"
+cd \control
+copy /y start.bat "C:\Icarus\Control\start.bat"
+copy /y update.bat "C:\Icarus\Control\update.bat"
 
 echo add autorun start.bat
 reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Run" /v "Icarus Server" /t REG_SZ /d "C:\Icarus\Control\start.bat" /f
 
+echo download and install steamcmd
+cd /d "%~dp0"
+curl -o steamcmd.zip https://steamcdn-a.akamaihd.net/client/installer/steamcmd.zip
+mkdir "C:\steamcmd"
+tar -xf steamcmd.zip -C "C:\steamcmd"
+del steamcmd.zip
+cd "C:\steamcmd"
+steamcmd +login anonymous +force_install_dir "C:\Icarus" +app_update 2089300 validate +quit
 
-
-:: additional software for Windows Server 2022
+echo additional software for Windows Server 2022
+cd /d "%~dp0"
 curl -o VC_redist.x64.exe https://download.visualstudio.microsoft.com/download/pr/eaab1f82-787d-4fd7-8c73-f782341a0c63/917C37D816488545B70AFFD77D6E486E4DD27E2ECE63F6BBAAF486B178B2B888/VC_redist.x64.exe
 VC_redist.x64.exe /install /quiet /norestart
 del VC_redist.x64.exe
@@ -46,34 +34,9 @@ directx_Jun2010_redist.exe /Q /T:"C:\dx"
 del directx_Jun2010_redist.exe
 cd "C:\dx"
 DXSETUP.exe /silent
+cd "C:\"
 rmdir /s /q "C:\dx"
 
-:: download and install steamcmd
-cd /d "%~dp0"
-curl -o steamcmd.zip https://steamcdn-a.akamaihd.net/client/installer/steamcmd.zip
-mkdir "C:\steamcmd"
-tar -xf steamcmd.zip -C "C:\steamcmd"
-del steamcmd.zip
-cd "C:\steamcmd"
-steamcmd +login anonymous +force_install_dir "C:\Icarus" +app_update 2089300 validate +quit
-
-:: запуск сервера
+echo start the server
 cd "C:\Icarus\Control"
 start.bat
-
-:: install directx
-::cd "C:\dx"
-::DXSETUP.exe /silent
-
-:: delete the folder with the directx installer
-::cd ..
-::rmdir /s /q "C:\dx"
-
-::mkdir "C:\icarus\control"
-::copy
-
-:: create a batch file to start the server
-::echo taskkill /pid IcarusServer-Win64-Shipping.exe > "C:\icarus\start.bat"
-
-:: переход в папку с батником
-::cd /d "%~dp0"
diff --git a/start.bat b/start.bat