swiftlint cleanup

Author: scriptingosx

Sources/quickpkg/ArchiveExtractor.swift

@@ -3,33 +3,33 @@ import Foundation
 struct ArchiveExtractor: Sendable {
   let executor: ShellExecutor
   let logger: Logger
-  
+
   /// Extract a zip archive to the specified directory
   func extractZip(_ archivePath: URL, to destinationDir: URL) async throws {
     logger.log("Extracting zip: \(archivePath.path) to \(destinationDir.path)", level: 1)
-    
+
     let result = try await executor.run([
       "/usr/bin/unzip",
       "-q",
       archivePath.path,
       "-d", destinationDir.path
     ])
-    
+
     guard result.exitCode == 0 else {
       throw QuickPkgError.archiveExtractionFailed("unzip failed (\(result.exitCode)): \(result.stderr)")
     }
   }
-  
+
   /// Extract a xip archive to the specified directory
   func extractXip(_ archivePath: URL, to destinationDir: URL) async throws {
     logger.log("Extracting xip: \(archivePath.path) to \(destinationDir.path)", level: 1)
-    
+
     // xip --expand extracts to the current directory, so we need to run it from the destination
     let result = try await executor.run(
       ["/usr/bin/xip", "--expand", archivePath.path],
       workingDirectory: destinationDir
     )
-    
+
     guard result.exitCode == 0 else {
       throw QuickPkgError.archiveExtractionFailed("xip failed (\(result.exitCode)): \(result.stderr)")
     }

Sources/quickpkg/DMGManager.swift

@@ -5,48 +5,48 @@ actor DMGManager {
   private let logger: Logger
   private var wasMounted: [URL: Bool] = [:]
   private var mountedVolumes: [URL] = []
-  
+
   init(
     executor: ShellExecutor,
     logger: Logger
   ) {
     self.executor = executor
     self.logger = logger
   }
-  
+
   /// Check if a DMG has a Software License Agreement
   func hasSLA(at path: URL) async throws -> Bool {
     let result = try await executor.runOrThrow([
       "/usr/bin/hdiutil", "imageinfo", path.path, "-plist"
     ])
-    
+
     let plist = try PlistHandler.parse(Data(result.stdout.utf8))
     if let properties = plist["Properties"] as? [String: Any],
        let hasSLA = properties["Software License Agreement"] as? Bool {
       return hasSLA
     }
     return false
   }
-  
+
   /// Check if DMG is already mounted and return mount points
   func existingMountPoints(for dmgPath: URL) async throws -> [URL]? {
     let result = try await executor.runOrThrow(["/usr/bin/hdiutil", "info", "-plist"])
-    
+
     let plistData = try PlistHandler.extractFirstPlist(from: Data(result.stdout.utf8))
     let info = try PlistHandler.parse(plistData)
-    
+
     guard let images = info["images"] as? [[String: Any]] else {
       return nil
     }
-    
+
     for image in images {
       guard let imagePath = image["image-path"] as? String else { continue }
-      
+
       // Check if this is our DMG (compare paths)
       let imageURL = URL(filePath: imagePath)
       if imageURL.standardizedFileURL == dmgPath.standardizedFileURL ||
           FileManager.default.contentsEqual(atPath: imageURL.path, andPath: dmgPath.path) {
-        
+
         var mountPoints: [URL] = []
         if let entities = image["system-entities"] as? [[String: Any]] {
           for entity in entities {
@@ -55,7 +55,7 @@ actor DMGManager {
             }
           }
         }
-        
+
         if !mountPoints.isEmpty {
           // Mark as pre-mounted so we don't detach it
           for mp in mountPoints {
@@ -65,24 +65,24 @@ actor DMGManager {
         }
       }
     }
-    
+
     return nil
   }
-  
+
   /// Attach a DMG and return mount points
   func attach(_ dmgPath: URL) async throws -> [URL] {
     // First check if already mounted
     if let existing = try await existingMountPoints(for: dmgPath) {
       logger.log("DMG already mounted at: \(existing.map(\.path).joined(separator: ", "))", level: 1)
       return existing
     }
-    
+
     // Check for SLA
     let sla = try await hasSLA(at: dmgPath)
     if sla {
       logger.log("NOTE: Disk image \(dmgPath.path) has a license agreement!", level: 0)
     }
-    
+
     // Mount the DMG
     let arguments = [
       "/usr/bin/hdiutil",
@@ -92,17 +92,17 @@ actor DMGManager {
       "-plist",
       "-nobrowse"
     ]
-    
+
     let result = try await executor.run(arguments, input: sla ? "Y\n" : nil)
-    
+
     guard result.exitCode == 0 else {
       throw QuickPkgError.dmgMountFailed("(\(result.exitCode)) \(result.stderr)")
     }
-    
+
     // Parse the plist output to get mount points
     let plistData = try PlistHandler.extractFirstPlist(from: Data(result.stdout.utf8))
     let attachResult = try PlistHandler.parse(plistData)
-    
+
     var mountPoints: [URL] = []
     if let entities = attachResult["system-entities"] as? [[String: Any]] {
       for entity in entities {
@@ -118,33 +118,33 @@ actor DMGManager {
         }
       }
     }
-    
+
     logger.log("Mounted DMG at: \(mountPoints.map(\.path).joined(separator: ", "))", level: 1)
     return mountPoints
   }
-  
+
   /// Detach a mounted volume
   func detach(_ mountPoint: URL) async throws {
     // Don't detach if it was already mounted before we started
     if wasMounted[mountPoint] == true {
       logger.log("Skipping detach for pre-mounted volume: \(mountPoint.path)", level: 2)
       return
     }
-    
+
     guard FileManager.default.fileExists(atPath: mountPoint.path) else { return }
-    
+
     let result = try await executor.run(["/usr/bin/hdiutil", "detach", mountPoint.path])
-    
+
     if result.exitCode != 0 {
       logger.log("Warning: Failed to detach \(mountPoint.path): \(result.stderr)", level: 1)
     } else {
       logger.log("Detached: \(mountPoint.path)", level: 2)
     }
-    
+
     mountedVolumes.removeAll { $0 == mountPoint }
     wasMounted.removeValue(forKey: mountPoint)
   }
-  
+
   /// Detach all volumes that we mounted
   func detachAll() async {
     for volume in mountedVolumes {

Sources/quickpkg/InputType.swift

@@ -6,7 +6,7 @@ enum InputType: String, CaseIterable {
   case dmg
   case zip
   case xip
-  
+
   static func from(path: String) -> InputType? {
     let ext = URL(filePath: path).pathExtension.lowercased()
     return InputType(rawValue: ext)

Sources/quickpkg/Logger.swift

@@ -2,7 +2,7 @@ import Foundation
 
 struct Logger: Sendable {
   let verbosity: Int
-  
+
   func log(_ message: String, level: Int = 0) {
     if verbosity >= level {
       print(message)

Sources/quickpkg/PackageBuilder.swift

@@ -3,7 +3,7 @@ import Foundation
 struct PackageBuilder: Sendable {
   let executor: ShellExecutor
   let logger: Logger
-  
+
   /// Analyze the payload and create a component plist
   func analyze(
     payloadDir: URL,
@@ -21,11 +21,11 @@ struct PackageBuilder: Sendable {
       "--install-location", installLocation,
       outputPlist.path
     ]
-    
+
     let result = try await executor.runOrThrow(arguments)
     logger.log(result.stdout, level: 1)
   }
-  
+
   /// Build the package
   func build(
     payloadDir: URL,

Sources/quickpkg/PlistHandler.swift

@@ -6,46 +6,46 @@ struct PlistHandler: Sendable {
     guard let string = String(data: data, encoding: .utf8) else {
       throw QuickPkgError.plistParsingFailed("Invalid UTF-8 data")
     }
-    
+
     let header = "<?xml version"
     let footer = "</plist>"
-    
+
     guard let startRange = string.range(of: header),
           let endRange = string.range(of: footer, range: startRange.upperBound..<string.endIndex) else {
       throw QuickPkgError.plistParsingFailed("No plist found in output")
     }
-    
+
     let plistString = String(string[startRange.lowerBound..<endRange.upperBound]) + "\n"
     return Data(plistString.utf8)
   }
-  
+
   /// Parse plist data into a dictionary
   static func parse(_ data: Data) throws -> [String: Any] {
     guard let plist = try PropertyListSerialization.propertyList(from: data, format: nil) as? [String: Any] else {
       throw QuickPkgError.plistParsingFailed("Invalid plist format - expected dictionary")
     }
     return plist
   }
-  
+
   /// Parse plist data into an array of dictionaries
   static func parseArray(_ data: Data) throws -> [[String: Any]] {
     guard let plist = try PropertyListSerialization.propertyList(from: data, format: nil) as? [[String: Any]] else {
       throw QuickPkgError.plistParsingFailed("Invalid plist format - expected array")
     }
     return plist
   }
-  
+
   /// Modify component plist to set BundleIsRelocatable
   static func setRelocatable(_ relocatable: Bool, in plistURL: URL) throws {
     let data = try Data(contentsOf: plistURL)
     var components = try parseArray(data)
-    
+
     for i in components.indices {
       if components[i]["BundleIsRelocatable"] != nil {
         components[i]["BundleIsRelocatable"] = relocatable
       }
     }
-    
+
     let outputData = try PropertyListSerialization.data(
       fromPropertyList: components,
       format: .xml,

Sources/quickpkg/QuickPkg.swift

@@ -12,7 +12,7 @@ struct QuickPkg: AsyncParsableCommand {
             Quickly build a package from an installed application, a disk image file,
             or zip/xip archive with an enclosed application bundle.
 
-            The tool extracts the application name, version, and other metadata from the application 
+            The tool extracts the application name, version, and other metadata from the application
             for the package installer metadata and to name the resulting pkg file.
 
             Example: quickpkg /path/to/installer_item

Sources/quickpkg/QuickPkgError.swift

@@ -15,7 +15,7 @@ enum QuickPkgError: LocalizedError {
   case scriptConflict(String)
   case commandFailed(command: String, exitCode: Int32, stderr: String)
   case plistParsingFailed(String)
-  
+
   var errorDescription: String? {
     switch self {
     case .unsupportedExtension(let ext):

Sources/quickpkg/ShellExecutor.swift

@@ -9,37 +9,37 @@ import SystemPackage
 
 struct ShellExecutor: Sendable {
   let logger: Logger
-  
+
   struct CommandResult: Sendable {
     let stdout: String
     let stderr: String
     let exitCode: Int32
   }
-  
+
   func run(
     _ arguments: [String],
     input inputString: String? = nil,
     workingDirectory: URL? = nil
   ) async throws -> CommandResult {
     logger.log("Executing: \(arguments.joined(separator: " "))", level: 3)
-    
+
     guard let executable = arguments.first else {
       throw QuickPkgError.commandFailed(command: "", exitCode: -1, stderr: "No command specified")
     }
-    
+
     let args = Array(arguments.dropFirst())
     let maxOutputSize = 10 * 1024 * 1024  // 10 MB limit
     let workDir = workingDirectory.map { FilePath($0.path) }
-    
+
     let result: CollectedResult<StringOutput<UTF8>, StringOutput<UTF8>>
-    
+
     let input: InputProtocol
     if let inputString {
       input = .string(inputString)
     } else {
       input = .none
     }
-    
+
     result = try await Subprocess.run(
       .path(FilePath(executable)),
       arguments: Arguments(args),
@@ -48,34 +48,34 @@ struct ShellExecutor: Sendable {
       output: .string(limit: maxOutputSize, encoding: UTF8.self),
       error: .string(limit: maxOutputSize, encoding: UTF8.self)
     )
-    
+
     let stdout = (result.standardOutput ?? "")
       .trimmingCharacters(in: .whitespacesAndNewlines)
     let stderr = (result.standardError ?? "")
       .trimmingCharacters(in: .whitespacesAndNewlines)
-    
+
     let exitCode: Int32
     switch result.terminationStatus {
     case .exited(let code):
       exitCode = code
     case .unhandledException(let code):
       exitCode = code
     }
-    
+
     return CommandResult(stdout: stdout, stderr: stderr, exitCode: exitCode)
   }
-  
+
   func runOrThrow(_ arguments: [String], input: String? = nil, workingDirectory: URL? = nil) async throws -> CommandResult {
     let result = try await run(arguments, input: input, workingDirectory: workingDirectory)
-    
+
     logger.log("Exit code: \(result.exitCode)", level: 3)
     if !result.stdout.isEmpty {
       logger.log("stdout: \(result.stdout)", level: 3)
     }
     if !result.stderr.isEmpty {
       logger.log("stderr: \(result.stderr)", level: 3)
     }
-    
+
     guard result.exitCode == 0 else {
       throw QuickPkgError.commandFailed(
         command: arguments.joined(separator: " "),