refactor: fix maxOS PATH env

Signed-off-by: leo <[email protected]>

Author: love-linger

src/Commands/Command.cs

@@ -198,10 +198,6 @@ private ProcessStartInfo CreateGitStartInfo()
                 start.Environment.Add("LC_ALL", "C");
             }
 
-            // Fix macOS `PATH` env
-            if (OperatingSystem.IsMacOS() && !string.IsNullOrEmpty(Native.OS.CustomPathEnv))
-                start.Environment.Add("PATH", Native.OS.CustomPathEnv);
-
             // Force using this app as git editor.
             switch (Editor)
             {

src/Commands/ExecuteCustomAction.cs

@@ -17,10 +17,6 @@ public static void Run(string repo, string file, string args)
             start.CreateNoWindow = true;
             start.WorkingDirectory = repo;
 
-            // Fix macOS `PATH` env
-            if (OperatingSystem.IsMacOS() && !string.IsNullOrEmpty(Native.OS.CustomPathEnv))
-                start.Environment.Add("PATH", Native.OS.CustomPathEnv);
-
             try
             {
                 Process.Start(start);
@@ -44,10 +40,6 @@ public static void RunAndWait(string repo, string file, string args, Action<stri
             start.StandardErrorEncoding = Encoding.UTF8;
             start.WorkingDirectory = repo;
 
-            // Fix macOS `PATH` env
-            if (OperatingSystem.IsMacOS() && !string.IsNullOrEmpty(Native.OS.CustomPathEnv))
-                start.Environment.Add("PATH", Native.OS.CustomPathEnv);
-
             var proc = new Process() { StartInfo = start };
             var builder = new StringBuilder();
 

src/Native/MacOS.cs

@@ -18,9 +18,22 @@ public void SetupApp(AppBuilder builder)
                 DisableDefaultApplicationMenuItems = true,
             });
 
+            // Fix `PATH` env on macOS.
+            var path = Environment.GetEnvironmentVariable("PATH");
+            if (string.IsNullOrEmpty(path))
+                path = "/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin";
+            else if (!path.Contains("/opt/homebrew/", StringComparison.Ordinal))
+                path = "/opt/homebrew/bin:/opt/homebrew/sbin:" + path;
+
             var customPathFile = Path.Combine(OS.DataDir, "PATH");
             if (File.Exists(customPathFile))
-                OS.CustomPathEnv = File.ReadAllText(customPathFile).Trim();
+            {
+                var env = File.ReadAllText(customPathFile).Trim();
+                if (!string.IsNullOrEmpty(env))
+                    path = env;
+            }            
+
+            Environment.SetEnvironmentVariable("PATH", path);
         }
 
         public string FindGitExecutable()

src/Native/OS.cs

@@ -31,12 +31,6 @@ public static string DataDir
             private set;
         } = string.Empty;
 
-        public static string CustomPathEnv
-        {
-            get;
-            set;
-        } = string.Empty;
-
         public static string GitExecutable
         {
             get => _gitExecutable;