Skip to content

Commit ae3f8fc

Browse files
committed
Add awaits to Linux platform and reformat
1 parent dd1d29c commit ae3f8fc

File tree

2 files changed

+42
-42
lines changed

2 files changed

+42
-42
lines changed

Sources/LinuxPlatform/Linux.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ public struct Linux: Platform {
255255
}
256256

257257
if requireSignatureValidation {
258-
guard (try? self.runProgram("gpg", "--version", quiet: true)) != nil else {
258+
guard (try? await self.runProgram("gpg", "--version", quiet: true)) != nil else {
259259
var msg = "gpg is not installed. "
260260
if let manager {
261261
msg += """
@@ -321,7 +321,7 @@ public struct Linux: Platform {
321321
}
322322
return false
323323
case "yum":
324-
try self.runProgram("yum", "list", "installed", package, quiet: true)
324+
try await self.runProgram("yum", "list", "installed", package, quiet: true)
325325
return true
326326
default:
327327
return true
@@ -382,7 +382,7 @@ public struct Linux: Platform {
382382
tmpDir / String(name)
383383
}
384384

385-
try self.runProgram((tmpDir / "swiftly").string, "init")
385+
try await self.runProgram((tmpDir / "swiftly").string, "init")
386386
}
387387
}
388388

Sources/SwiftlyCore/Platform.swift

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Foundation
2-
import SystemPackage
32
import Subprocess
3+
import SystemPackage
44
#if os(macOS)
55
import System
66
#else
@@ -271,22 +271,22 @@ extension Platform {
271271
error: .fileDescriptor(.standardError, closeAfterSpawningProcess: false),
272272
)
273273

274-
// TODO figure out how to set the process group
274+
// TODO: figure out how to set the process group
275275
// Attach this process to our process group so that Ctrl-C and other signals work
276-
/*let pgid = tcgetpgrp(STDOUT_FILENO)
277-
if pgid != -1 {
278-
tcsetpgrp(STDOUT_FILENO, process.processIdentifier)
279-
}
276+
/* let pgid = tcgetpgrp(STDOUT_FILENO)
277+
if pgid != -1 {
278+
tcsetpgrp(STDOUT_FILENO, process.processIdentifier)
279+
}
280280

281-
defer {
282-
if pgid != -1 {
283-
tcsetpgrp(STDOUT_FILENO, pgid)
284-
}
285-
}
281+
defer {
282+
if pgid != -1 {
283+
tcsetpgrp(STDOUT_FILENO, pgid)
284+
}
285+
}
286286

287-
process.waitUntilExit()*/
287+
process.waitUntilExit() */
288288

289-
if case .exited(let code) = result.terminationStatus, code != 0 {
289+
if case let .exited(code) = result.terminationStatus, code != 0 {
290290
throw RunProgramError(exitCode: code, program: args.first!, arguments: Array(args.dropFirst()))
291291
}
292292
} else {
@@ -298,27 +298,27 @@ extension Platform {
298298
error: .discarded,
299299
)
300300

301-
// TODO figure out how to set the process group
301+
// TODO: figure out how to set the process group
302302
// Attach this process to our process group so that Ctrl-C and other signals work
303-
/*let pgid = tcgetpgrp(STDOUT_FILENO)
304-
if pgid != -1 {
305-
tcsetpgrp(STDOUT_FILENO, process.processIdentifier)
306-
}
303+
/* let pgid = tcgetpgrp(STDOUT_FILENO)
304+
if pgid != -1 {
305+
tcsetpgrp(STDOUT_FILENO, process.processIdentifier)
306+
}
307307

308-
defer {
309-
if pgid != -1 {
310-
tcsetpgrp(STDOUT_FILENO, pgid)
311-
}
312-
}
308+
defer {
309+
if pgid != -1 {
310+
tcsetpgrp(STDOUT_FILENO, pgid)
311+
}
312+
}
313313

314-
process.waitUntilExit()*/
314+
process.waitUntilExit() */
315315

316-
if case .exited(let code) = result.terminationStatus, code != 0 {
316+
if case let .exited(code) = result.terminationStatus, code != 0 {
317317
throw RunProgramError(exitCode: code, program: args.first!, arguments: Array(args.dropFirst()))
318318
}
319319
}
320320

321-
// TODO handle exits with a signal
321+
// TODO: handle exits with a signal
322322
}
323323

324324
/// Run a program and capture its output.
@@ -349,19 +349,19 @@ extension Platform {
349349
error: .discarded,
350350
)
351351

352-
// TODO Attach this process to our process group so that Ctrl-C and other signals work
353-
/*let pgid = tcgetpgrp(STDOUT_FILENO)
354-
if pgid != -1 {
355-
tcsetpgrp(STDOUT_FILENO, process.processIdentifier)
356-
}
357-
defer {
358-
if pgid != -1 {
359-
tcsetpgrp(STDOUT_FILENO, pgid)
360-
}
361-
}
362-
*/
363-
364-
if case .exited(let code) = result.terminationStatus, code != 0 {
352+
// TODO: Attach this process to our process group so that Ctrl-C and other signals work
353+
/* let pgid = tcgetpgrp(STDOUT_FILENO)
354+
if pgid != -1 {
355+
tcsetpgrp(STDOUT_FILENO, process.processIdentifier)
356+
}
357+
defer {
358+
if pgid != -1 {
359+
tcsetpgrp(STDOUT_FILENO, pgid)
360+
}
361+
}
362+
*/
363+
364+
if case let .exited(code) = result.terminationStatus, code != 0 {
365365
throw RunProgramError(exitCode: code, program: args.first!, arguments: Array(args.dropFirst()))
366366
}
367367

0 commit comments

Comments
 (0)