Merge pull request #640 from danger/fix_url_crash

f-meloni · web-flow · commit 2ff024bb6f2c · 2025-01-29T10:34:39.000+01:00
Fix current directory url creation
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,8 @@
 
 ## Master
 
+- Fix current directory url creation [@f-meloni][] - [#640](https://github.com/danger/swift/pull/640)
+
 ## 3.21.0
 
 - Add mise support [@msnazarow][] - [#633](https://github.com/danger/swift/pull/633)
diff --git a/Sources/Runner/Commands/Runner.swift b/Sources/Runner/Commands/Runner.swift
@@ -159,9 +159,9 @@ func runDanger(version dangerSwiftVersion: String, logger: Logger) throws {
     proc.arguments = args
     let standardOutput = FileHandle.standardOutput
     if let cwdOptionIndex = CommandLine.arguments.firstIndex(of: DangeSwiftRunnerOption.cwd.rawValue),
-       (cwdOptionIndex + 1) < CommandLine.arguments.count,
-       let directoryURL = URL(string: CommandLine.arguments[cwdOptionIndex + 1])
+       (cwdOptionIndex + 1) < CommandLine.arguments.count
     {
+        let directoryURL = URL(fileURLWithPath: CommandLine.arguments[cwdOptionIndex + 1])
         proc.currentDirectoryURL = directoryURL
     }
     proc.standardOutput = standardOutput

Original file line number	Diff line number	Diff line change
`@@ -159,9 +159,9 @@ func runDanger(version dangerSwiftVersion: String, logger: Logger) throws {`
`159`	`159`	`proc.arguments = args`
`160`	`160`	`let standardOutput = FileHandle.standardOutput`
`161`	`161`	`if let cwdOptionIndex = CommandLine.arguments.firstIndex(of: DangeSwiftRunnerOption.cwd.rawValue),`
`162`		`- (cwdOptionIndex + 1) < CommandLine.arguments.count,`
`163`		`- let directoryURL = URL(string: CommandLine.arguments[cwdOptionIndex + 1])`
	`162`	`+ (cwdOptionIndex + 1) < CommandLine.arguments.count`
`164`	`163`	`{`
	`164`	`+ let directoryURL = URL(fileURLWithPath: CommandLine.arguments[cwdOptionIndex + 1])`
`165`	`165`	`proc.currentDirectoryURL = directoryURL`
`166`	`166`	`}`
`167`	`167`	`proc.standardOutput = standardOutput`