From 06b423ad68a82f35fdf96d060daafc3d4671bb66 Mon Sep 17 00:00:00 2001
From: YR Chen <stevapple@icloud.com>
Date: Tue, 22 Dec 2020 22:23:23 +0800
Subject: [PATCH] Minor behavioral fixes

---
 Sources/TSCBasic/Process.swift | 4 +++-
 Sources/TSCBasic/misc.swift    | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Sources/TSCBasic/Process.swift b/Sources/TSCBasic/Process.swift
index ab79d893..2dea1bb5 100644
--- a/Sources/TSCBasic/Process.swift
+++ b/Sources/TSCBasic/Process.swift
@@ -334,7 +334,9 @@ public final class Process: ObjectIdentifierProtocol {
             searchPaths.append(AbsolutePath(String(decodingCString: buffer, as: UTF16.self)))
 
             // The 16-bit Windows system directory
-            searchPaths.append(AbsolutePath("\(ProcessEnv.vars["systemdrive"] ?? "C:")\\System"))
+            if let systemDrive = ProcessEnv.vars["systemdrive"] {
+                searchPaths.append(AbsolutePath("\(systemDrive))\\System"))
+            }
 
             // The Windows directory
             GetWindowsDirectoryW(&buffer, .init(MAX_PATH + 1))
diff --git a/Sources/TSCBasic/misc.swift b/Sources/TSCBasic/misc.swift
index 45efdace..3afd4c79 100644
--- a/Sources/TSCBasic/misc.swift
+++ b/Sources/TSCBasic/misc.swift
@@ -91,7 +91,7 @@ public func lookupExecutablePath(
     guard var value = value, !value.isEmpty else {
         return nil
     }
-    let isPath = value.contains("\\")
+    let isPath = value.contains("\\") || value.contains("/")
     if !isPath && !value.contains(".") {
         value.append(executableFileSuffix)
     }