Skip to content

Commit 484d1ef

Browse files
parkeraitaiferber
authored andcommitted
Adopt correct name of ProcessInfo.processInfo on Linux
1 parent 1780821 commit 484d1ef

File tree

4 files changed

+0
-16
lines changed

4 files changed

+0
-16
lines changed

Sources/Commands/SwiftTestTool.swift

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -291,11 +291,7 @@ public struct SwiftTestTool: SwiftTool {
291291

292292
// Execute the XCTest with inherited environment as it is convenient to pass senstive
293293
// information like username, password etc to test cases via enviornment variables.
294-
#if os(Linux)
295-
let result: Void? = try? system(args, environment: ProcessInfo.processInfo().environment)
296-
#else
297294
let result: Void? = try? system(args, environment: ProcessInfo.processInfo.environment)
298-
#endif
299295
return result != nil
300296
}
301297

Sources/Get/Git.swift

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,7 @@ extension Git {
2525
}
2626

2727
do {
28-
#if os(Linux)
29-
let env = ProcessInfo.processInfo().environment
30-
#else
3128
let env = ProcessInfo.processInfo.environment
32-
#endif
3329
try system(Git.tool, "clone",
3430
"--recursive", // get submodules too so that developers can use these if they so choose
3531
"--depth", "10",

Sources/SourceControl/GitRepository.swift

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,7 @@ public class GitRepositoryProvider: RepositoryProvider {
4747
do {
4848
// FIXME: We need infrastructure in this subsystem for reporting
4949
// status information.
50-
#if os(Linux)
51-
let env = ProcessInfo.processInfo().environment
52-
#else
5350
let env = ProcessInfo.processInfo.environment
54-
#endif
5551
try system(
5652
Git.tool, "clone", "--bare", repository.url, path.asString,
5753
environment: env, message: "Cloning \(repository.url)")

Sources/Utility/Git.swift

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,7 @@ public class Git {
121121
}
122122

123123
public func fetch() throws {
124-
#if os(Linux)
125-
try system(Git.tool, "-C", path.asString, "fetch", "--tags", "origin", environment: ProcessInfo.processInfo().environment, message: nil)
126-
#else
127124
try system(Git.tool, "-C", path.asString, "fetch", "--tags", "origin", environment: ProcessInfo.processInfo.environment, message: nil)
128-
#endif
129125
}
130126
}
131127

0 commit comments

Comments
 (0)