Merge pull request #1651 from FelschR/patch-1

make platform identification POSIX-compliant
OmniSharp · Nov 15, 2019 · 9544671 · 9544671
2 parents cbfca2c + 2e37c48
commit 9544671
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/OmniSharp.Shared/Utilities/Platform.cs b/src/OmniSharp.Shared/Utilities/Platform.cs
@@ -80,8 +80,8 @@ private static Platform GetCurrentPlatform()
             }
             else
             {
-                // If this is not Windows, run 'uname' on Bash to get the OS name and architecture.
-                var output = RunOnBashAndCaptureOutput("uname", "-s -m");
+                // If this is not Windows, run 'uname' on a POSIX shell to get the OS name and architecture.
+                var output = RunOnShellAndCaptureOutput("uname", "-s -m");
                 if (string.IsNullOrEmpty(output))
                 {
                     return new Platform();
@@ -126,7 +126,7 @@ private static Platform GetCurrentPlatform()
 
         private static Version GetMacOSVersion()
         {
-            var versionText = RunOnBashAndCaptureOutput("sw_vers", "-productVersion");
+            var versionText = RunOnShellAndCaptureOutput("sw_vers", "-productVersion");
             return ParseVersion(versionText);
         }
 
@@ -191,7 +191,7 @@ private static Version ParseVersion(string versionText)
             return null;
         }
 
-        private static string RunOnBashAndCaptureOutput(string fileName, string arguments)
-            => ProcessHelper.RunAndCaptureOutput("/bin/bash", $"-c '{fileName} {arguments}'");
+        private static string RunOnShellAndCaptureOutput(string fileName, string arguments)
+            => ProcessHelper.RunAndCaptureOutput("/bin/sh", $"-c '{fileName} {arguments}'");
     }
 }