Minor behavioral fixes

swiftlang · Dec 22, 2020 · 06b423a · 06b423a
1 parent 556d422
commit 06b423a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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)
     }