Skip to content

Foreground process fix #226

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 9 commits into from
Feb 13, 2025
Merged

Foreground process fix #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
46f7e38
Consistency in y/n prompts #141 fix, where certain prompts would fail…
Feb 7, 2025
9826fc2
Fixed bug where child process did not set parent process back to fore…
Feb 11, 2025
c765ea6
Merge branch 'main' into foreground-process-fix
johnbute Feb 11, 2025
91dc698
fixed formatting and added defer
Feb 12, 2025
e03a99b
Merge branch 'foreground-process-fix' of https://github.com/johnbute/…
Feb 12, 2025
5c2c0d4
fixed formatting issue
Feb 12, 2025
4657d8b
Merge branch 'swiftlang:main' into foreground-process-fix
johnbute Feb 12, 2025
4b5165a
improved locality of defer
Feb 13, 2025
23bd1ea
Merge branch 'foreground-process-fix' of https://github.com/johnbute/…
Feb 13, 2025
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
1 change: 1 addition & 0 deletions Sources/Swiftly/Init.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ internal struct Init: SwiftlyCommand {
These locations can be changed with SWIFTLY_HOME and SWIFTLY_BIN environment variables and run this again.
\(installMsg)
""")

guard SwiftlyCore.promptForConfirmation(defaultBehavior: true) else {
throw SwiftlyError(message: "Swiftly installation has been cancelled")
}
Expand Down
9 changes: 9 additions & 0 deletions Sources/SwiftlyCore/Platform.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,11 @@ extension Platform {
if pgid != -1 {
tcsetpgrp(STDOUT_FILENO, process.processIdentifier)
}

defer { if pgid != -1 {
tcsetpgrp(STDOUT_FILENO, pgid)
}}

process.waitUntilExit()

guard process.terminationStatus == 0 else {
Expand Down Expand Up @@ -250,6 +255,10 @@ extension Platform {
if pgid != -1 {
tcsetpgrp(STDOUT_FILENO, process.processIdentifier)
}
defer { if pgid != -1 {
tcsetpgrp(STDOUT_FILENO, pgid)
}}

let outData = try outPipe.fileHandleForReading.readToEnd()

process.waitUntilExit()
Expand Down