Merge pull request #3 from mackoj/feat/minor2

Change order
mackoj · Oct 25, 2022 · 82da5a3 · 82da5a3
2 parents a7eb76d + 3401188
commit 82da5a3
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/Plugins/PackageGenerator/PackageGenerator.swift b/Plugins/PackageGenerator/PackageGenerator.swift
@@ -41,10 +41,10 @@ struct PackageGenerator {
     var cliArguments: [String] = [
       "--output-file-url",
       parsedPackageFileURL.path,
-      "--package-directory",
-      packageDirectory.path,
       "--input-file-url",
       packagesFileURL.path,
+      "--package-directory",
+      packageDirectory.path,
     ]
 
     if config.verbose {
@@ -62,21 +62,28 @@ struct PackageGenerator {
     )
 
     if FileManager.default.fileExists(atPath: parsedPackageFileURL.path) == false {
-      fatalError(.warning, "No update to Package.swift needed")
+      Diagnostics.emit(.warning, "No update to Package.swift needed")
     }
 
     // Load ParsedPackage
     var parsedPackages: [ParsedPackage] = []
     do {
       let data = try Data(contentsOf: parsedPackageFileURL)
       parsedPackages = try JSONDecoder().decode([ParsedPackage].self, from: data)
-
-      try FileManager.default.removeItem(at: parsedPackageFileURL)
-      try FileManager.default.removeItem(at: packagesFileURL)
     } catch {
       fatalError(.error, "Failed to read at \(parsedPackageFileURL.path)")
       fatalError(.error, "Failed to JSONDecode at \(parsedPackageFileURL.path)")
+    }
+
+    do {
+      try FileManager.default.removeItem(at: parsedPackageFileURL)
+    } catch {
       Diagnostics.emit(.warning, "Failed to removeItem at \(parsedPackageFileURL.path)")
+    }
+
+    do {
+      try FileManager.default.removeItem(at: packagesFileURL)
+    } catch {
       Diagnostics.emit(.warning, "Failed to removeItem at \(packagesFileURL.path)")
     }
     print("\(parsedPackages.count) packages found")