fixup

Author: tomerd

Sources/Commands/SwiftPackageRegistryTool.swift

@@ -84,8 +84,8 @@ public struct SwiftPackageRegistryTool: ParsableCommand {
         var url: String
 
         func run(_ swiftTool: SwiftTool) throws {
-            guard let url = URL(string: self.url),
-                  url.scheme == "https"
+            guard let url = URL(string: self.url)//,
+                  //url.scheme == "https"
             else {
                 throw RegistryConfigurationError.invalidURL(self.url)
             }

Sources/PackageRegistry/RegistryClient.swift

@@ -378,12 +378,17 @@ public final class RegistryClient {
         // prepare target download locations
         let downloadPath = destinationPath.withExtension("zip")
         do {
+            // prepare directories
+            if !fileSystem.exists(downloadPath.parentDirectory) {
+                try fileSystem.createDirectory(downloadPath.parentDirectory, recursive: true)
+            }
+            // clear out download path if exists
+            try fileSystem.removeFileTree(downloadPath)
             // validate that the destination does not already exist
             guard !fileSystem.exists(destinationPath) else {
                 throw RegistryError.pathAlreadyExists(destinationPath)
             }
-            // clear out download path if exists
-            try fileSystem.removeFileTree(downloadPath)
+            try fileSystem.createDirectory(destinationPath, recursive: true)
         } catch {
             return completion(.failure(error))
         }
@@ -421,7 +426,9 @@ public final class RegistryClient {
                             // TODO: Bail if archive contains relative paths or overlapping files
                             archiver.extract(from: downloadPath, to: destinationPath) { result in
                                 defer { try? fileSystem.removeFileTree(downloadPath) }
-                                completion(result)
+                                completion(result.mapError { error in
+                                    StringError("failed extracting '\(downloadPath)' to '\(destinationPath)': \(error)")
+                                })
                             }
                         } catch {
                             completion(.failure(error))
@@ -628,7 +635,7 @@ extension RegistryClient {
             }
 
             public struct AdditionalMetadata: Codable {
-                public let description: String
+                public let description: String?
 
                 public init(description: String) {
                     self.description = description

Sources/Workspace/Workspace.swift

@@ -3352,7 +3352,11 @@ extension Workspace {
              throw StringError("registry not configured")
          }
 
-         let downloadPath = self.location.registryDownloadDirectory.appending(components: package.identity.description, version.description)
+         guard case (let scope, let name)? = package.identity.scopeAndName else {
+             throw StringError("invalid package identity")
+         }
+
+         let downloadPath = self.location.registryDownloadDirectory.appending(components: scope.description, name.description, version.description)
          if self.fileSystem.exists(downloadPath) {
              return downloadPath
          }