Skip to content

Print file URLs without leading file schema #244

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
Mar 7, 2025
Merged

Print file URLs without leading file schema #244

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions Sources/MacOSPlatform/MacOS.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,11 +128,11 @@ public struct MacOS: Platform {
let decoder = PropertyListDecoder()
let infoPlist = toolchainDir.appendingPathComponent("Info.plist")
guard let data = try? Data(contentsOf: infoPlist) else {
throw SwiftlyError(message: "could not open \(infoPlist)")
throw SwiftlyError(message: "could not open \(infoPlist.path)")
}

guard let pkgInfo = try? decoder.decode(SwiftPkgInfo.self, from: data) else {
throw SwiftlyError(message: "could not decode plist at \(infoPlist)")
throw SwiftlyError(message: "could not decode plist at \(infoPlist.path)")
}

try FileManager.default.removeItem(at: toolchainDir)
Expand Down
4 changes: 2 additions & 2 deletions Sources/Swiftly/Use.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ internal struct Use: SwiftlyCommand {
// We don't care in this case if there were any problems with the swift version files, just overwrite it with the new value
try toolchain.name.write(to: versionFile, atomically: true, encoding: .utf8)

message = "The file `\(versionFile)` has been set to `\(toolchain)`"
message = "The file `\(versionFile.path)` has been set to `\(toolchain)`"
} else if let newVersionFile = findNewVersionFile(), !globalDefault {
if !assumeYes {
SwiftlyCore.print("A new file `\(newVersionFile)` will be created to set the new in-use toolchain for this project. Alternatively, you can set your default globally with the `--global-default` flag. Proceed with creating this file?")
Expand All @@ -129,7 +129,7 @@ internal struct Use: SwiftlyCommand {

try toolchain.name.write(to: newVersionFile, atomically: true, encoding: .utf8)

message = "The file `\(newVersionFile)` has been set to `\(toolchain)`"
message = "The file `\(newVersionFile.path)` has been set to `\(toolchain)`"
} else {
config.inUse = toolchain
try config.save()
Expand Down