Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Commit 009a34a

Browse files
Changing copy method of git and logs
1 parent dba5632 commit 009a34a

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

src/GitHub.Api/Installer/GitInstaller.cs

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -307,12 +307,15 @@ private GitInstallationState ExtractGit(GitInstallationState state)
307307
{
308308
Logger.Info("Moving Git source:{0} target:{1}", source.ToString(), target.ToString());
309309

310-
target.DeleteIfExists();
311-
target.EnsureParentDirectoryExists();
310+
Logger.Info("DeleteContents target:{0}", target.ToString());
311+
target.DeleteContents();
312312

313-
Logger.Info("target Exists: {0}", target.Exists());
313+
Logger.Info("MoveFiles fromPath: {0} toPath:{1}", source.ToString(), target.ToString());
314+
source.MoveFiles(target, true);
315+
316+
Logger.Info("Delete source:{0}", source.ToString());
317+
source.Delete();
314318

315-
source.Move(target);
316319
state.GitIsValid = true;
317320
state.IsCustomGitPath = state.GitExecutablePath != installDetails.GitExecutablePath;
318321
}
@@ -334,12 +337,12 @@ private GitInstallationState ExtractGit(GitInstallationState state)
334337
var target = state.GitLfsInstallationPath;
335338
if (unzipTask.Successful)
336339
{
337-
Logger.Info("Moving Git source:{0} target:{1}", source.ToString(), target.ToString());
340+
Logger.Info("Moving GitLFS source:{0} target:{1}", source.ToString(), target.ToString());
338341

339342
target.DeleteIfExists();
340343
target.EnsureParentDirectoryExists();
341344

342-
Logger.Info("target Exists: {0}", target.Exists());
345+
Logger.Info("GitLFS target Exists: {0}", target.Exists());
343346

344347
source.Move(target);
345348
state.GitLfsIsValid = true;

src/GitHub.Api/Installer/OctorunInstaller.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ private NPath MoveOctorun(NPath fromPath)
6161
Logger.Info("MoveFiles fromPath: {0} toPath:{1}", fromPath.ToString(), toPath.ToString());
6262
fromPath.MoveFiles(toPath, true);
6363

64-
Logger.Info("Delete fromPath:{0}", fromPath.ToString());
64+
Logger.Info("Delete fromPath.Parent:{0}", fromPath.Parent.ToString());
6565
fromPath.Parent.Delete();
6666

6767
return installDetails.ExecutablePath;

0 commit comments

Comments
 (0)