Merge pull request #34595 from van800/mac_rider

Fix search for Rider path on Mac
godotengine · Dec 26, 2019 · 318c693 · 318c693
2 parents f90e8c4 + 682dd04
commit 318c693
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/modules/mono/editor/GodotTools/GodotTools/Ides/Rider/RiderPathLocator.cs b/modules/mono/editor/GodotTools/GodotTools/Ides/Rider/RiderPathLocator.cs
@@ -89,18 +89,20 @@ private static RiderInfo[] CollectRiderInfosMac()
         {
             var installInfos = new List<RiderInfo>();
             // "/Applications/*Rider*.app"
+            // should be combined with "Contents/MacOS/rider"
             var folder = new DirectoryInfo("/Applications");
             if (folder.Exists)
             {
                 installInfos.AddRange(folder.GetDirectories("*Rider*.app")
-                  .Select(a => new RiderInfo(a.FullName, false))
+                  .Select(a => new RiderInfo(Path.Combine(a.FullName, "Contents/MacOS/rider"), false))
                   .ToList());
             }
 
             // /Users/user/Library/Application Support/JetBrains/Toolbox/apps/Rider/ch-1/181.3870.267/Rider EAP.app
+            // should be combined with "Contents/MacOS/rider"
             var toolboxRiderRootPath = GetToolboxBaseDir();
             var paths = CollectPathsFromToolbox(toolboxRiderRootPath, "", "Rider*.app", true)
-              .Select(a => new RiderInfo(a, true));
+              .Select(a => new RiderInfo(Path.Combine(a, "Contents/MacOS/rider"), true));
             installInfos.AddRange(paths);
 
             return installInfos.ToArray();