Only swap path environment variables

Author: MDrakos

internal/runners/exec/exec.go

@@ -6,7 +6,6 @@ import (
 	"os/exec"
 	"path/filepath"
 	"runtime"
-	"sort"
 	"strconv"
 	"strings"
 
@@ -185,12 +184,7 @@ func (s *Exec) Run(params *Params, args ...string) (rerr error) {
 		}
 	}
 
-	// Sort the env so our PATH environment variable is interpreted first
-	envs := osutils.EnvMapToSlice(env)
-	sort.Slice(envs, func(i, j int) bool {
-		return envs[i] > envs[j]
-	})
-	_, _, err = osutils.ExecuteAndPipeStd(exeTarget, args[1:], envs)
+	_, _, err = osutils.ExecuteAndPipeStd(exeTarget, args[1:], sortPaths(osutils.EnvMapToSlice(env)))
 	if eerr, ok := err.(*exec.ExitError); ok {
 		return errs.Silence(errs.WrapExitCode(eerr, eerr.ExitCode()))
 	}
@@ -201,6 +195,46 @@ func (s *Exec) Run(params *Params, args ...string) (rerr error) {
 	return nil
 }
 
+// sortPaths the env so our PATH environment variable is interpreted first
+func sortPaths(env []string) []string {
+	if runtime.GOOS != "windows" {
+		return env
+	}
+
+	const (
+		windowsPathPrefix = "Path="
+		unixPathPrefix    = "PATH="
+	)
+
+	var windowsPathIndex, unixPathIndex = -1, -1
+	for i, e := range env {
+		switch {
+		case strings.HasPrefix(e, windowsPathPrefix):
+			windowsPathIndex = i
+		case strings.HasPrefix(e, unixPathPrefix):
+			unixPathIndex = i
+		}
+		if windowsPathIndex != -1 && unixPathIndex != -1 {
+			break
+		}
+	}
+
+	if windowsPathIndex == -1 || unixPathIndex == -1 {
+		return env
+	}
+
+	// Ensure Unix PATH is after Windows PATH
+	if windowsPathIndex > unixPathIndex {
+		env[windowsPathIndex], env[unixPathIndex] = env[unixPathIndex], env[windowsPathIndex]
+	}
+
+	for _, e := range env {
+		fmt.Println(e)
+	}
+
+	return env
+}
+
 func projectFromRuntimeDir(cfg projectfile.ConfigGetter, runtimeDir string) string {
 	projects := projectfile.GetProjectMapping(cfg)
 	for _, paths := range projects {