Fix issues in git/octorun installer step

Skip installers if we know we have a valid git/gitlfs on startup
Don't constantly copy the octorun zip if we already have it

Author: shana

src/GitHub.Api/Application/ApplicationManagerBase.cs

@@ -70,37 +70,43 @@ public void Run()
                         }
                     }
 
-                    bool skipInstallers = false;
                     state = SystemSettings.Get<GitInstallationState>(Constants.GitInstallationState) ?? state;
-                    var now = DateTimeOffset.Now;
-                    if (now.Date == state.GitLastCheckTime.Date && state.GitIsValid && state.GitLfsIsValid)
+                    if (state.GitIsValid && state.GitLfsIsValid)
                     {
-                        // just check if the git/git lfs version is what we need
                         if (firstRun)
                         {
+                            // just check if the git/git lfs version is what we need
                             var version = new GitVersionTask(token)
                                 .Configure(ProcessManager, state.GitExecutablePath, dontSetupGit: true)
-                                .Catch(e => true)
+                                .Catch(e =>
+                                {
+                                    Logger.Error(e, "Error getting git version");
+                                    return true;
+                                })
                                 .RunWithReturn(true);
                             state.GitIsValid = version >= Constants.MinimumGitVersion;
                             if (state.GitIsValid)
                             {
                                 version = new GitLfsVersionTask(token)
                                 .Configure(ProcessManager, state.GitLfsExecutablePath, dontSetupGit: true)
-                                .Catch(e => true)
+                                .Catch(e =>
+                                {
+                                    Logger.Error(e, "Error getting lfs version");
+                                    return true;
+                                })
                                 .RunWithReturn(true);
                                 state.GitLfsIsValid = version >= Constants.MinimumGitLfsVersion;
                             }
                         }
                     }
 
-                    if (!skipInstallers)
-                    {
-                        Environment.OctorunScriptPath = new OctorunInstaller(Environment, TaskManager)
-                            .SetupOctorunIfNeeded();
+                    Environment.OctorunScriptPath = new OctorunInstaller(Environment, TaskManager)
+                        .SetupOctorunIfNeeded();
 
+                    if (!state.GitIsValid || !state.GitLfsIsValid)
+                    {
                         state = new GitInstaller(Environment, ProcessManager, CancellationToken, SystemSettings)
-                        { Progress = progressReporter }
+                            { Progress = progressReporter }
                             .SetupGitIfNeeded();
                     }
 
@@ -167,7 +173,13 @@ public void SetupGit(GitInstaller.GitInstallationState state)
                     })
                     .RunWithReturn(true);
 
-                GitClient.LfsInstall().RunWithReturn(true);
+                GitClient.LfsInstall()
+                    .Catch(e =>
+                    {
+                        Logger.Error(e, "Error running lfs install");
+                        return true;
+                    })
+                    .RunWithReturn(true);
 
                 if (Environment.IsWindows)
                 {

src/GitHub.Api/Installer/GitInstaller.cs

@@ -78,13 +78,10 @@ public GitInstallationState VerifyGitFromSettings(GitInstallationState state)
             state = ValidateGitVersion(state);
             if (state.GitIsValid)
                 state.GitInstallationPath = state.GitExecutablePath.Parent.Parent;
-            else
-            {
-                state.GitLfsInstallationPath = NPath.Default;
-                state.GitLfsExecutablePath = NPath.Default;
-            }
-            NPath gitLfsPath = ProcessManager.FindExecutableInPath(installDetails.GitLfsExecutable, true, state.GitInstallationPath);
+            state.GitLfsExecutablePath = ProcessManager.FindExecutableInPath(installDetails.GitLfsExecutable, true, state.GitInstallationPath);
             state = ValidateGitLfsVersion(state);
+            if (state.GitLfsIsValid)
+                state.GitLfsInstallationPath = state.GitInstallationPath;
             return state;
         }
 

src/GitHub.Api/Installer/OctorunInstaller.cs

@@ -29,30 +29,24 @@ public NPath SetupOctorunIfNeeded()
             NPath path = NPath.Default;
             var isOctorunExtracted = IsOctorunExtracted();
             if (isOctorunExtracted)
-                path = installDetails.ExecutablePath;
+                return installDetails.ExecutablePath;
+
             GrabZipFromResources();
 
-            if (!path.IsInitialized)
-            {
-                var tempZipExtractPath = NPath.CreateTempDirectory("octorun_extract_archive_path");
-                var unzipTask = new UnzipTask(taskManager.Token, installDetails.ZipFile,
-                        tempZipExtractPath, sharpZipLibHelper,
-                        fileSystem);
-                var extractPath = unzipTask.RunWithReturn(true);
-                if (unzipTask.Successful)
-                    path = MoveOctorun(extractPath.Combine("octorun"));
-                tempZipExtractPath.DeleteIfExists();
-            }
+            var tempZipExtractPath = NPath.CreateTempDirectory("octorun_extract_archive_path");
+            var unzipTask = new UnzipTask(taskManager.Token, installDetails.ZipFile,
+                    tempZipExtractPath, sharpZipLibHelper,
+                    fileSystem)
+                    .Catch(e => { Logger.Error(e, "Error extracting octorun"); return true; });
+            var extractPath = unzipTask.RunWithReturn(true);
+            if (unzipTask.Successful)
+                path = MoveOctorun(extractPath.Combine("octorun"));
             return path;
         }
 
         private NPath GrabZipFromResources()
         {
-            installDetails.ZipFile.DeleteIfExists();
-            
-            AssemblyResources.ToFile(ResourceType.Generic, "octorun.zip", installDetails.BaseZipPath, environment);
-            
-            return installDetails.ZipFile;
+            return AssemblyResources.ToFile(ResourceType.Generic, "octorun.zip", installDetails.BaseZipPath, environment);
         }
 
         private NPath MoveOctorun(NPath fromPath)
@@ -61,6 +55,7 @@ private NPath MoveOctorun(NPath fromPath)
             toPath.DeleteIfExists();
             toPath.EnsureParentDirectoryExists();
             fromPath.Move(toPath);
+            fromPath.Parent.Delete();
             return installDetails.ExecutablePath;
         }