Merge #3984 Detect and use Windows KSP2 executable on Linux

KSP-CKAN · Jan 2, 2024 · 65728a6 · 65728a6
2 parents 7cf9d0b + ad08574
commit 65728a6
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@ All notable changes to this project will be documented in this file.
 - [CLI] Pause after administrator error message (#3966 by: HebaruSan; reviewed: techman83)
 - [Multiple] Put auto-installed mods in ignored modpack group by default (#3978 by: HebaruSan)
 - [GUI] Add links to hidden tags and labels below mod list (#3979, #3980 by: HebaruSan)
+- [Core] Detect and use Windows KSP2 executable on Linux (#3984 by: JackOfHertz; reviewed: HebaruSan)
 
 ### Bugfixes
 

diff --git a/Core/Games/KerbalSpaceProgram2.cs b/Core/Games/KerbalSpaceProgram2.cs
@@ -149,9 +149,13 @@ public void RebuildSubdirectories(string absGameRoot)
         }
 
         public string DefaultCommandLine(string path)
-            => Platform.IsUnix ? "./KSP2.x86_64 -single-instance"
-             : Platform.IsMac  ? "./KSP2.app/Contents/MacOS/KSP"
-             :                   "KSP2_x64.exe -single-instance";
+            => Platform.IsMac
+                ? "./KSP2.app/Contents/MacOS/KSP2"
+                : string.Format(Platform.IsUnix ? "./{0} -single-instance"
+                                                : "{0} -single-instance",
+                                InstanceAnchorFiles.FirstOrDefault(f =>
+                                    File.Exists(Path.Combine(path, f)))
+                                ?? InstanceAnchorFiles.First());
 
         public string[] AdjustCommandLine(string[] args, GameVersion installedVersion)
             => args;
@@ -213,10 +217,19 @@ private GameVersion VersionFromFile(string path)
 
         public string CompatibleVersionsFile => "compatible_game_versions.json";
 
-        public string[] InstanceAnchorFiles => new string[]
-        {
-            "KSP2_x64.exe",
-        };
+        public string[] InstanceAnchorFiles =>
+            Platform.IsUnix
+                ? new string[]
+                {
+                    // Native Linux port, if/when it arrives
+                    "KSP2.x86_64",
+                    // Windows EXE via Proton on Linux
+                    "KSP2_x64.exe",
+                }
+                : new string[]
+                {
+                    "KSP2_x64.exe",
+                };
 
         public Uri DefaultRepositoryURL => new Uri("https://github.com/KSP-CKAN/KSP2-CKAN-meta/archive/main.tar.gz");