mirror of
https://github.com/wabbajack-tools/wabbajack.git
synced 2024-08-30 18:42:17 +00:00
Fix OSX detection
This commit is contained in:
parent
cc0c2d2eac
commit
fb8bbfaf7e
@ -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))
|
||||||
if (OSDescription.StartsWith("Microsoft Windows"))
|
os = "Linux";
|
||||||
tuple = ("Windows", tuple.ProcessArchitecture);
|
if (IsOSPlatform(OSPlatform.Windows))
|
||||||
|
os = "Windows";
|
||||||
|
if (IsOSPlatform(OSPlatform.OSX))
|
||||||
|
os = "OSX";
|
||||||
|
|
||||||
|
var tuple = (os, 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)
|
||||||
|
Loading…
Reference in New Issue
Block a user