diff options
author | Ignacio Roldán Etcheverry <neikeq@users.noreply.github.com> | 2019-12-26 02:16:55 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-26 02:16:55 +0100 |
commit | 318c69351624f7794c51b5385d252af397c0404a (patch) | |
tree | 249c4ed8d70e2e2e4f806981c75738615f4687a3 /modules/mono/editor | |
parent | f90e8c41a21dcb28a53e4b1a4fc64904b8861aaa (diff) | |
parent | 682dd04b2d2b7de3a34dcbac193af4e653dcc018 (diff) |
Merge pull request #34595 from van800/mac_rider
Fix search for Rider path on Mac
Diffstat (limited to 'modules/mono/editor')
-rw-r--r-- | modules/mono/editor/GodotTools/GodotTools/Ides/Rider/RiderPathLocator.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/modules/mono/editor/GodotTools/GodotTools/Ides/Rider/RiderPathLocator.cs b/modules/mono/editor/GodotTools/GodotTools/Ides/Rider/RiderPathLocator.cs index b752535dcb..9038333d38 100644 --- a/modules/mono/editor/GodotTools/GodotTools/Ides/Rider/RiderPathLocator.cs +++ b/modules/mono/editor/GodotTools/GodotTools/Ides/Rider/RiderPathLocator.cs @@ -89,18 +89,20 @@ namespace GodotTools.Ides.Rider { 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(); |