Fixed operating system check

Luatrauma · Aug 30, 2024 · 78465c5 · 78465c5
1 parent c907a01
commit 78465c5
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 25 deletions.
diff --git a/Luatrauma.AutoUpdater/Luatrauma.AutoUpdater.csproj b/Luatrauma.AutoUpdater/Luatrauma.AutoUpdater.csproj
@@ -5,21 +5,5 @@
         <TargetFramework>net6.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-
-        <IsWindows Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">true</IsWindows>
-        <IsOSX Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">true</IsOSX>
-        <IsLinux Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">true</IsLinux>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(IsWindows)'=='true'">
-        <DefineConstants>WINDOWS</DefineConstants>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(IsOSX)'=='true'">
-        <DefineConstants>OSX</DefineConstants>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(IsLinux)'=='true'">
-        <DefineConstants>LINUX</DefineConstants>
     </PropertyGroup>
 </Project>
diff --git a/Luatrauma.AutoUpdater/Updater.cs b/Luatrauma.AutoUpdater/Updater.cs
@@ -14,15 +14,25 @@ static class Updater
 
         public async static Task Update()
         {
-            string patchUrl;
-
-#if WINDOWS
-            patchUrl = "https://github.com/evilfactory/LuaCsForBarotrauma/releases/download/latest/luacsforbarotrauma_patch_windows_client.zip";
-#elif LINUX
-            patchUrl = "https://github.com/evilfactory/LuaCsForBarotrauma/releases/download/latest/luacsforbarotrauma_patch_linux_client.zip";
-#elif MACOS
-            patchUrl = "https://github.com/evilfactory/LuaCsForBarotrauma/releases/download/latest/luacsforbarotrauma_patch_mac_client.zip;
-#endif
+            string patchUrl = null;
+            if (OperatingSystem.IsWindows())
+            {
+                patchUrl = "https://github.com/evilfactory/LuaCsForBarotrauma/releases/download/latest/luacsforbarotrauma_patch_windows_client.zip";
+            }
+            else if (OperatingSystem.IsLinux())
+            {
+                patchUrl = "https://github.com/evilfactory/LuaCsForBarotrauma/releases/download/latest/luacsforbarotrauma_patch_linux_client.zip";
+            }
+            else if (OperatingSystem.IsMacOS())
+            {
+                patchUrl = "https://github.com/evilfactory/LuaCsForBarotrauma/releases/download/latest/luacsforbarotrauma_patch_mac_client.zip";
+            }
+
+            if (patchUrl == null)
+            {
+                Console.WriteLine("Unsupported operating system.");
+                return;
+            }
 
             string tempFolder = Path.Combine(Directory.GetCurrentDirectory(), TempFolder);
             string patchZip = Path.Combine(tempFolder, "patch.zip");