Mirrored_Repos/wabbajack
1
0
Fork 0
mirror of https://github.com/wabbajack-tools/wabbajack.git synced 2024-08-30 18:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix OSX detection

Browse Source
This commit is contained in:
Timothy Baldridge 2021-09-27 17:59:01 -06:00
parent cc0c2d2eac
commit fb8bbfaf7e
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Wabbajack.CLI/DTOs/CefCDNResponse.cs
View File

@ -127,16 +127,22 @@ namespace Wabbajack.CLI.DTOs
public File FindSource(string downloadVersion) public File FindSource(string downloadVersion)
{ {
var tuple = (OSDescription.Split(" ").First().Trim(), ProcessArchitecture); string os = "";
if (IsOSPlatform(OSPlatform.Linux))
os = "Linux";
if (IsOSPlatform(OSPlatform.Windows))
os = "Windows";
if (IsOSPlatform(OSPlatform.OSX))
os = "OSX";
if (OSDescription.StartsWith("Microsoft Windows")) var tuple = (os, ProcessArchitecture);
tuple = ("Windows", tuple.ProcessArchitecture);
List<Version> versions = new(); List<Version> versions = new();
if (tuple == ("Linux", Architecture.X64)) versions = Linux64.Versions; if (tuple == ("Linux", Architecture.X64)) versions = Linux64.Versions;
else if (tuple == ("Linux", Architecture.X86)) versions = Linux32.Versions; else if (tuple == ("Linux", Architecture.X86)) versions = Linux32.Versions;
else if (tuple == ("Windows", Architecture.X64)) versions = Windows64.Versions; else if (tuple == ("Windows", Architecture.X64)) versions = Windows64.Versions;
else if (tuple == ("OSX", Architecture.X64)) versions = Macosx64.Versions;
var version = versions.Where(v => v.CefVersion.StartsWith(downloadVersion + ".")) var version = versions.Where(v => v.CefVersion.StartsWith(downloadVersion + "."))
.OrderByDescending(v => v.ChromiumVersion) .OrderByDescending(v => v.ChromiumVersion)