Skip to content

armgit / xtool

Public Imported from GitHub
0

Cross-platform Xcode replacement. Build and deploy iOS apps with SwiftPM on Linux, Windows, macOS.

Validate SDK before overwriting (#192)

Kabir Oberai7a5dfd2ccdf3
diff --git a/Sources/XToolSupport/SDKBuilder.swift b/Sources/XToolSupport/SDKBuilder.swift
index c940fbc..ef3bc6c 100644
--- a/Sources/XToolSupport/SDKBuilder.swift
+++ b/Sources/XToolSupport/SDKBuilder.swift
@@ -18,7 +18,10 @@ struct SDKBuilder {
init(path: String) throws {
var isDir: ObjCBool = false
guard FileManager.default.fileExists(atPath: path, isDirectory: &isDir) else {
- throw Console.Error("Could not read file or directory at path '\(path)'")
+ throw Console.Error("""
+ Could not read file or directory at path '\(path)'.
+ See 'xtool help sdk' for usage.
+ """)
}
let url = URL(fileURLWithPath: path)
diff --git a/Sources/XToolSupport/SDKCommand.swift b/Sources/XToolSupport/SDKCommand.swift
index d587ec8..18f550d 100644
--- a/Sources/XToolSupport/SDKCommand.swift
+++ b/Sources/XToolSupport/SDKCommand.swift
@@ -243,14 +243,15 @@ struct InstallSDKOperation {
#if os(macOS)
print("Skipping SDK install; the iOS SDK ships with Xcode on macOS")
#else
+ // validate input before removing existing SDK
+ let input = try SDKBuilder.Input(path: path)
+ let arch = try ArchSelection.auto.sdkBuilderArch
+
if let sdk = try await DarwinSDK.current() {
print("Removing existing SDK...")
try sdk.remove()
}
- let input = try SDKBuilder.Input(path: path)
- let arch = try ArchSelection.auto.sdkBuilderArch
-
let tempDir = try TemporaryDirectory(name: "DarwinSDKBuild")
let builder = SDKBuilder(input: input, outputPath: tempDir.url.path, arch: arch)
let sdkPath = try await builder.buildSDK()