From bb52118071acac2c48dfe4afe0af83c4370d3d74 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Tue, 19 Jul 2022 15:19:16 -0700 Subject: [PATCH] BuildServerBuildSystem: share more code across platforms Simply adjust the variable name spelling rather than duplicate the logic. This is a minor cleanup, NFC. Co-authored-by: Alex Hoppen --- Sources/SKCore/BuildServerBuildSystem.swift | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Sources/SKCore/BuildServerBuildSystem.swift b/Sources/SKCore/BuildServerBuildSystem.swift index 978b63d51..e5f034cd5 100644 --- a/Sources/SKCore/BuildServerBuildSystem.swift +++ b/Sources/SKCore/BuildServerBuildSystem.swift @@ -71,14 +71,14 @@ public final class BuildServerBuildSystem { let configPath = projectRoot.appending(component: "buildServer.json") let config = try loadBuildServerConfig(path: configPath, fileSystem: fileSystem) #if os(Windows) - self.searchPaths = - getEnvSearchPaths(pathString: ProcessInfo.processInfo.environment["Path"], - currentWorkingDirectory: fileSystem.currentWorkingDirectory) + let pathEnvironmentVar = "Path" #else + let pathEnvironmentVar = "PATH" +#endif self.searchPaths = - getEnvSearchPaths(pathString: ProcessInfo.processInfo.environment["PATH"], + getEnvSearchPaths(pathString: ProcessInfo.processInfo.environment["Path"], currentWorkingDirectory: fileSystem.currentWorkingDirectory) -#endif + self.buildFolder = buildFolder self.projectRoot = projectRoot self.requestQueue = DispatchQueue(label: "build_server_request_queue")