Re-download checkout if failing to reset

JamitLabs · May 1, 2019 · 80bb12a · 80bb12a
1 parent a83d11f
commit 80bb12a
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/Sources/AccioKit/Commands/Protocols/DependencyInstaller.swift b/Sources/AccioKit/Commands/Protocols/DependencyInstaller.swift
@@ -34,9 +34,16 @@ extension DependencyInstaller {
                 let frameworkCheckoutPath: String = checkoutsDirUrl.appendingPathComponent(fileName).path
 
                 if try FileManager.default.isDirectory(atPath: frameworkCheckoutPath) {
-                    try bash("git -C '\(frameworkCheckoutPath)' reset HEAD --hard --quiet 2> /dev/null")
-                    try bash("git -C '\(frameworkCheckoutPath)' clean -fd --quiet 2> /dev/null")
-                    try bash("git -C '\(frameworkCheckoutPath)' clean -fdX --quiet 2> /dev/null")
+                    do {
+                        try bash("git -C '\(frameworkCheckoutPath)' reset HEAD --hard --quiet 2> /dev/null")
+                        try bash("git -C '\(frameworkCheckoutPath)' clean -fd --quiet 2> /dev/null")
+                        try bash("git -C '\(frameworkCheckoutPath)' clean -fdX --quiet 2> /dev/null")
+                    }
+                    catch {
+                        // Remove checkout if git reset fails for some reason
+                        // If the checkout is missing, SPM will automatically clone again in the next step
+                        FileManager.default.removeItem(atPath: frameworkCheckoutPath)
+                    }
                 }
             }
         }