Merge pull request #925 from github-for-unity/fixes/cannot-move-octorun

Changing how zip extracted resources are moved to their destination

Author: StanleyGoldman

src/GitHub.Api/Installer/GitInstaller.cs

@@ -301,15 +301,18 @@ private GitInstallationState ExtractGit(GitInstallationState state)
                         return true;
                     });
                 unzipTask.Progress(p => Progress.UpdateProgress(40 + (long)(20 * p.Percentage), 100, unzipTask.Message));
-                var path = unzipTask.RunSynchronously();
+                var source = unzipTask.RunSynchronously();
                 var target = state.GitInstallationPath;
                 if (unzipTask.Successful)
                 {
-                    var source = path;
-                    target.DeleteIfExists();
-                    target.EnsureParentDirectoryExists();
-                    source.Move(target);
+                    Logger.Trace("Moving Git source:{0} target:{1}", source.ToString(), target.ToString());
+
+                    target.DeleteContents();
+                    source.MoveFiles(target, true);
+                    source.Parent.Delete();
+
                     state.GitIsValid = true;
+
                     state.IsCustomGitPath = state.GitExecutablePath != installDetails.GitExecutablePath;
                 }
             }
@@ -326,14 +329,16 @@ private GitInstallationState ExtractGit(GitInstallationState state)
                         return true;
                     });
                 unzipTask.Progress(p => Progress.UpdateProgress(60 + (long)(20 * p.Percentage), 100, unzipTask.Message));
-                var path = unzipTask.RunSynchronously();
+                var source = unzipTask.RunSynchronously();
                 var target = state.GitLfsInstallationPath;
                 if (unzipTask.Successful)
                 {
-                    var source = path;
-                    target.DeleteIfExists();
-                    target.EnsureParentDirectoryExists();
-                    source.Move(target);
+                    Logger.Trace("Moving GitLFS source:{0} target:{1}", source.ToString(), target.ToString());
+
+                    target.DeleteContents();
+                    source.MoveFiles(target, true);
+                    source.Parent.Delete();
+
                     state.GitLfsIsValid = true;
                 }
             }

src/GitHub.Api/Installer/OctorunInstaller.cs

@@ -52,10 +52,13 @@ private NPath GrabZipFromResources()
         private NPath MoveOctorun(NPath fromPath)
         {
             var toPath = installDetails.InstallationPath;
-            toPath.DeleteIfExists();
-            toPath.EnsureParentDirectoryExists();
-            fromPath.Move(toPath);
+
+            Logger.Trace("MoveOctorun fromPath: {0} toPath:{1}", fromPath.ToString(), toPath.ToString());
+
+            toPath.DeleteContents();
+            fromPath.MoveFiles(toPath, true);
             fromPath.Parent.Delete();
+
             return installDetails.ExecutablePath;
         }