Merge pull request #472 from robinkunde/rk/fixDerivedDataPath

MattKiazyk · web-flow · commit 2418d22f719f · 2024-01-23T22:12:41.000-06:00
Remove newline from derived data path returned by defaults
diff --git a/Xcodes/AcknowledgementsGenerator/Sources/AcknowledgementsGenerator/Tools/Xcode.swift b/Xcodes/AcknowledgementsGenerator/Sources/AcknowledgementsGenerator/Tools/Xcode.swift
@@ -35,7 +35,7 @@ private extension Xcode {
         try? task.run()
         let handle = pipe.fileHandleForReading
         let data = handle.readDataToEndOfFile()
-        let path = String(data: data, encoding: String.Encoding.utf8)
+        let path = String(data: data, encoding: String.Encoding.utf8)?.trimmingCharacters(in: .whitespacesAndNewlines)
         return (path?.isEmpty ?? true) ? nil : path
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ private extension Xcode {`
`35`	`35`	`try? task.run()`
`36`	`36`	`let handle = pipe.fileHandleForReading`
`37`	`37`	`let data = handle.readDataToEndOfFile()`
`38`		`- let path = String(data: data, encoding: String.Encoding.utf8)`
	`38`	`+ let path = String(data: data, encoding: String.Encoding.utf8)?.trimmingCharacters(in: .whitespacesAndNewlines)`
`39`	`39`	`return (path?.isEmpty ?? true) ? nil : path`
`40`	`40`	`}`
`41`	`41`	`}`