From bf057263cc84f9601cf93948aa87807188e524ae Mon Sep 17 00:00:00 2001 From: Kabir Oberai Date: Tue, 10 Jun 2025 17:09:06 -0400 Subject: [PATCH] Support unxipping Xcode betas (#115) Xcode betas are stored in the xip as Xcode-beta.app. Support this by avoiding hardcoding the `Xcode.app` path. --- Sources/XToolSupport/SDKBuilder.swift | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Sources/XToolSupport/SDKBuilder.swift b/Sources/XToolSupport/SDKBuilder.swift index 40b2dd36..f78cfd26 100644 --- a/Sources/XToolSupport/SDKBuilder.swift +++ b/Sources/XToolSupport/SDKBuilder.swift @@ -238,7 +238,19 @@ struct SDKBuilder { try await extractXIP(inputPath: inputPath, outDir: devStage.path) }.value try Task.checkCancellation() - appDir = devStage.appendingPathComponent("Xcode.app") + let contents = try FileManager.default.contentsOfDirectory( + at: devStage, + includingPropertiesForKeys: nil + ) + let apps = contents.filter { $0.pathExtension == "app" } + switch apps.count { + case 0: + throw Console.Error("Unrecognized xip layout (Xcode.app not found)") + case 1: + appDir = apps[0] + default: + throw Console.Error("Unrecognized xip layout (multiple apps found)") + } cleanupStageDir = devStage case .app(let appPath): wanted = nil