Fix an issue with duplicate files being restored

minuscorp · Aug 2, 2020 · 4456a3e · 4456a3e
1 parent a81edae
commit 4456a3e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Sources/tunisia/Classes/Tunisia.swift b/Sources/tunisia/Classes/Tunisia.swift
@@ -20,7 +20,7 @@ import TunisiaKit
 struct Tunisia: ParsableCommand {
     static let name = String(describing: Self.self)
 
-    static let version = "0.0.3"
+    static let version = "0.0.5"
 
     static var configuration = CommandConfiguration(
         version: Tunisia.version,

diff --git a/Sources/tunisia/Commands/Restore.swift b/Sources/tunisia/Commands/Restore.swift
@@ -54,7 +54,11 @@ struct Restore: ParsableCommand {
                 if try FileUtils.directoryFileContents(at: directory.relativePath) {
                     let fileList = try FileManager.default.contentsOfDirectory(atPath: directory.relativePath)
                     for file in fileList where file != ".DS_Store" && file != "" {
-                        try FileManager.default.copyItem(atPath: directory.appendingPathComponent(file, isDirectory: false).relativePath, toPath: destinationPath + "/" + directory.pathComponents.last! + "/" + file)
+                        let fileDirectory = destinationPath + "/" + directory.pathComponents.last! + "/" + file
+                        if FileManager.default.fileExists(atPath: fileDirectory) {
+                            try FileUtils.remove(path: fileDirectory)
+                        }
+                        try FileManager.default.copyItem(atPath: directory.appendingPathComponent(file, isDirectory: false).relativePath, toPath: fileDirectory)
                     }
                 }
             }