Making sure all paths get deleted

Author: StanleyGoldman

src/GitHub.Api/Installer/PortableGitInstallTask.cs

@@ -168,8 +168,8 @@ private bool InstallGit(NPath targetPath)
         {
             Logger.Trace("InstallGit");
 
-            var tempPath = NPath.CreateTempDirectory("git_zip_path");
-            var gitArchivePath = AssemblyResources.ToFile(ResourceType.Platform, "git.zip", tempPath, environment);
+            var tempZipPath = NPath.CreateTempDirectory("git_zip_path");
+            var gitArchivePath = AssemblyResources.ToFile(ResourceType.Platform, "git.zip", tempZipPath, environment);
 
             if (!environment.FileSystem.FileExists(gitArchivePath))
             {
@@ -195,7 +195,7 @@ private bool InstallGit(NPath targetPath)
                 return false;
             }
 
-            tempPath.DeleteIfExists();
+            tempZipPath.DeleteIfExists();
 
             return true;
         }
@@ -204,8 +204,8 @@ private bool InstallGitLfs(NPath targetPath)
         {
             Logger.Trace("InstallGitLfs");
 
-            var tempPath = NPath.CreateTempDirectory("git_lfs_zip_path");
-            var gitLfsArchivePath = AssemblyResources.ToFile(ResourceType.Platform, "git-lfs.zip", tempPath, environment);
+            var tempZipPath = NPath.CreateTempDirectory("git_lfs_zip_path");
+            var gitLfsArchivePath = AssemblyResources.ToFile(ResourceType.Platform, "git-lfs.zip", tempZipPath, environment);
 
             if (!environment.FileSystem.FileExists(gitLfsArchivePath))
             {
@@ -215,22 +215,22 @@ private bool InstallGitLfs(NPath targetPath)
 
             Token.ThrowIfCancellationRequested();
 
-            var tempDirectory = NPath.CreateTempDirectory("git_lfs_extract_path");
+            var tempZipExtractPath = NPath.CreateTempDirectory("git_lfs_extract_path");
 
             try
             {
-                Logger.Trace("Extracting gitLfsArchivePath:\"{0}\" tempDirectory:\"{1}\"", gitLfsArchivePath, tempDirectory);
-                ZipHelper.ExtractZipFile(gitLfsArchivePath, tempDirectory, Token);
+                Logger.Trace("Extracting gitLfsArchivePath:\"{0}\" tempDirectory:\"{1}\"", gitLfsArchivePath, tempZipExtractPath);
+                ZipHelper.ExtractZipFile(gitLfsArchivePath, tempZipExtractPath, Token);
             }
             catch (Exception ex)
             {
-                Logger.Warning(ex, $"Error Extracting gitLfsArchivePath:\"{gitLfsArchivePath}\" tempDirectory:\"{tempDirectory}\"");
+                Logger.Warning(ex, $"Error Extracting gitLfsArchivePath:\"{gitLfsArchivePath}\" tempDirectory:\"{tempZipExtractPath}\"");
                 return false;
             }
 
             Token.ThrowIfCancellationRequested();
 
-            var tempDirectoryGitLfsExec = tempDirectory.Combine(installDetails.GitLfsExec);
+            var tempDirectoryGitLfsExec = tempZipExtractPath.Combine(installDetails.GitLfsExec);
 
             var targetLfsExecPath = installDetails.GetGitLfsExecPath(targetPath);
             try
@@ -244,8 +244,9 @@ private bool InstallGitLfs(NPath targetPath)
                 return false;
             }
 
-            Logger.Trace("Deleting tempDirectory:\"{0}\"", tempDirectory);
-            tempDirectory.DeleteIfExists();
+            tempZipPath.DeleteIfExists();
+            tempZipExtractPath.DeleteIfExists();
+
             return true;
         }
     }