fix work Zx on linux/mac env

Author: neuecc

sandbox/ConsoleApp/Program.cs

@@ -8,53 +8,52 @@
 using Zx;
 using static Zx.Env;
 
-var version = await "dotnet --version";
+await "dotnet add --help";
 
+//// `await string` execute process like shell
+////await "cat package.json | grep name";
 
-// `await string` execute process like shell
-//await "cat package.json | grep name";
+//var lst = await runl($"dotnet --list-sdks");
 
-var lst = await runl($"dotnet --list-sdks");
+//// receive result msg of stdout
+//var branch = await "git branch --show-current";
+////await $"dep deploy --branch={branch}";
 
-// receive result msg of stdout
-var branch = await "git branch --show-current";
-//await $"dep deploy --branch={branch}";
+//// parallel request (similar as Task.WhenAll)
+//await new[]
+//{
+//    "echo 1",
+//    "echo 2",
+//    "echo 3",
+//};
 
-// parallel request (similar as Task.WhenAll)
-await new[]
-{
-    "echo 1",
-    "echo 2",
-    "echo 3",
-};
+//// you can also use cd(chdir)
+//await "cd ../../";
 
-// you can also use cd(chdir)
-await "cd ../../";
+//// run with $"" automatically escaped and quoted
+//var dir = "foo/foo bar";
+//await run($"mkdir {dir}"); // mkdir "/foo/foo bar"
 
-// run with $"" automatically escaped and quoted
-var dir = "foo/foo bar";
-await run($"mkdir {dir}"); // mkdir "/foo/foo bar"
+//// helper for Console.WriteLine and colorize
+//log("red log.", System.ConsoleColor.Red);
+//using (color(System.ConsoleColor.Blue))
+//{
+//    log("blue log");
+//    System.Console.WriteLine("also blue");
+//    await run($"echo {"blue blue blue"}");
+//}
 
-// helper for Console.WriteLine and colorize
-log("red log.", System.ConsoleColor.Red);
-using (color(System.ConsoleColor.Blue))
-{
-    log("blue log");
-    System.Console.WriteLine("also blue");
-    await run($"echo {"blue blue blue"}");
-}
+//// helper for web request
+//var text = await fetchText("http://wttr.in");
+//log(text);
 
-// helper for web request
-var text = await fetchText("http://wttr.in");
-log(text);
+//// helper for ReadLine(stdin)
+//var bear = await question("What kind of bear is best?");
+//log($"You answered: {bear}");
 
-// helper for ReadLine(stdin)
-var bear = await question("What kind of bear is best?");
-log($"You answered: {bear}");
 
 
-
-await ignore(run($"dotnet noinfo"));
+//await ignore(run($"dotnet noinfo"));
 
 
 

src/ProcessX/Zx/Env.cs

@@ -26,7 +26,14 @@ public static string shell
                     }
                     else
                     {
-                        _shell = ProcessStartAsync("which bash", CancellationToken.None, forceSilcent: true).Result + " -c";
+                        if (Which.TryGetPath("bash", out var bashPath))
+                        {
+                            _shell = bashPath + " -c";
+                        }
+                        else
+                        {
+                            throw new InvalidOperationException("shell is not found in PATH, set Env.shell manually.");
+                        }
                     }
                 }
                 return _shell;
@@ -210,11 +217,11 @@ public static IDisposable color(ConsoleColor color)
 
         static async Task<(string StdOut, string StdError)> ProcessStartAsync(string command, CancellationToken cancellationToken, bool forceSilcent = false)
         {
-            var cmd = shell + " " + command;
+            var cmd = shell + " \"" + command + "\"";
             var sbOut = new StringBuilder();
             var sbError = new StringBuilder();
 
-            var (_, stdout, stderror) = ProcessX.GetDualAsyncEnumerable(cmd, workingDirectory, envVars);
+            var (_, stdout, stderror) = Cysharp.Diagnostics.ProcessX.GetDualAsyncEnumerable(cmd, workingDirectory, envVars);
 
             var runStdout = Task.Run(async () =>
             {
@@ -268,11 +275,11 @@ public static IDisposable color(ConsoleColor color)
 
         static async Task<(string[] StdOut, string[] StdError)> ProcessStartListAsync(string command, CancellationToken cancellationToken, bool forceSilcent = false)
         {
-            var cmd = shell + " " + command;
+            var cmd = shell + " \"" + command + "\"";
             var sbOut = new List<string>();
             var sbError = new List<string>();
 
-            var (_, stdout, stderror) = ProcessX.GetDualAsyncEnumerable(cmd, workingDirectory, envVars);
+            var (_, stdout, stderror) = Cysharp.Diagnostics.ProcessX.GetDualAsyncEnumerable(cmd, workingDirectory, envVars);
 
             var runStdout = Task.Run(async () =>
             {

src/ProcessX/Zx/Which.cs

@@ -0,0 +1,52 @@
+// This class is borrowd from https://github.com/mayuki/Chell
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices;
+
+namespace Zx
+{
+    internal static class Which
+    {
+        public static bool TryGetPath(string commandName, out string matchedPath)
+        {
+            var isWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
+            var paths = (Environment.GetEnvironmentVariable("PATH") ?? string.Empty).Split(isWindows ? ';' : ':');
+            var pathExts = Array.Empty<string>();
+
+            if (isWindows)
+            {
+                paths = paths.Prepend(Environment.CurrentDirectory).ToArray();
+                pathExts = (Environment.GetEnvironmentVariable("PATHEXT") ?? ".COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH;.MSC").Split(';');
+            }
+
+            foreach (var path in paths)
+            {
+                // /path/to/foo.ext
+                foreach (var ext in pathExts)
+                {
+                    var fullPath = Path.Combine(path, $"{commandName}{ext}");
+                    if (File.Exists(fullPath))
+                    {
+                        matchedPath = fullPath;
+                        return true;
+                    }
+                }
+
+                // /path/to/foo
+                {
+                    var fullPath = Path.Combine(path, commandName);
+                    if (File.Exists(fullPath))
+                    {
+                        matchedPath = fullPath;
+                        return true;
+                    }
+                }
+            }
+
+            matchedPath = string.Empty;
+            return false;
+        }
+    }
+}