Skip to content

More fixes proposed by Gwynne #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 25, 2023
Merged

More fixes proposed by Gwynne #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 4 additions & 20 deletions Sources/ShellOut.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,13 +434,8 @@ private extension Process {

waitUntilExit()

if let handle = outputHandle, !handle.isStandard {
handle.closeFile()
}

if let handle = errorHandle, !handle.isStandard {
handle.closeFile()
}
outputHandle?.closeFile()
errorHandle?.closeFile()

outputPipe.fileHandleForReading.readabilityHandler = nil
errorPipe.fileHandleForReading.readabilityHandler = nil
Expand All @@ -461,23 +456,12 @@ private extension Process {
}
}

private extension FileHandle {
var isStandard: Bool {
return self === FileHandle.standardOutput ||
self === FileHandle.standardError ||
self === FileHandle.standardInput
}
}

private extension Data {
func shellOutput() -> String {
guard let output = String(data: self, encoding: .utf8) else {
return ""
}
let output = String(decoding: self, as: UTF8.self)

guard !output.hasSuffix("\n") else {
let endIndex = output.index(before: output.endIndex)
return String(output[..<endIndex])
return String(output.dropLast())
}

return output
Expand Down