Remove swiftly from the path during proxying #311
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Retaining swiftly in the path increases the probability that a tool might run the proxy again, resulting in circularities. Also, tools will locate programs in the path to try and find adjacent toolchain files that cannot be discovered in the swiftly bin directory. Remove the swiftly bin directory from the path when proxying to help improve the experience with other tools.
…t they need from argv[0]
…the selected toolchain
|
@swift-ci test macOS |
cmcgee1024
added
the
release candidate
|
@swift-ci test macOS |
plemarquand
reviewed
Apr 10, 2025
Sources/SwiftlyCore/Platform.swift
Outdated
| var newPath = newEnv["PATH"] ?? "" | ||
| if !newPath.hasPrefix(tcPath.path + ":") { | ||
| newPath = "\(tcPath.path):\(newPath)" | ||
| if pathComponents.first ?? "" != tcPath.path { |
There was a problem hiding this comment.
This probably doesn't matter but do you want to remove tcPath from the path components before prepending it, so that we're guaranteed one instance of it and its always the first entry?
There was a problem hiding this comment.
Thanks, I will make this change. There's two paths that we're managing here, so there might as well be only one and zero of them.
…ing it is only in the front
|
@swift-ci test macOS |
plemarquand
approved these changes
Apr 14, 2025
cmcgee1024
added a commit
to cmcgee1024/swiftly
that referenced
this pull request
Apr 14, 2025
Retaining swiftly in the path increases the probability that a tool might run the proxy again, resulting in circularities. Also, tools will locate programs in the path to try and find adjacent toolchain files that cannot be discovered in the swiftly bin directory. Remove the swiftly bin directory from the path when proxying to help improve the experience with other tools.
cmcgee1024
added a commit
that referenced
this pull request
Apr 14, 2025
Remove swiftly from the path during proxying (#311) Retaining swiftly in the path increases the probability that a tool might run the proxy again, resulting in circularities. Also, tools will locate programs in the path to try and find adjacent toolchain files that cannot be discovered in the swiftly bin directory. Remove the swiftly bin directory from the path when proxying to help improve the experience with other tools.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Retaining swiftly in the path increases the probability that a tool might run the proxy again, resulting in circularities. Also, tools will locate programs in the path to try and find adjacent toolchain files that cannot be discovered in the swiftly bin directory.
Remove the swiftly bin directory from the path when proxying to help improve the experience with other tools.
Use fully-qualified paths to the command where possible when proxying so that drivers can find their location via argv[0].