Fix running git installer if octorun also needs installing

Author: shana

src/GitHub.Api/Application/ApplicationManagerBase.cs

@@ -61,12 +61,7 @@ public void Run(bool firstRun)
             isBusy = true;
 
             var octorunInstaller = new OctorunInstaller(Environment, TaskManager);
-            var setupTask = octorunInstaller
-                .SetupOctorunIfNeeded()
-                .Then((s, octorunPath) =>
-                    {
-                        Environment.OctorunScriptPath = octorunPath;
-                    });
+            var setupTask = octorunInstaller.SetupOctorunIfNeeded();
 
             var initializeGitTask = new FuncTask<NPath>(CancellationToken, () =>
                 {
@@ -78,6 +73,15 @@ public void Run(bool firstRun)
                     }
                     return NPath.Default;
                 });
+            var setOctorunEnvironmentTask = new ActionTask<NPath>(CancellationToken, (s, octorunPath) =>
+                {
+                    Environment.OctorunScriptPath = octorunPath;
+                });
+
+            setupTask.OnEnd += (t, path, _, __) =>
+                {
+                    t.GetEndOfChain().Then(setOctorunEnvironmentTask).Then(initializeGitTask);
+                };
 
             initializeGitTask.OnEnd += (t, path, _, __) =>
                 {
@@ -101,7 +105,7 @@ public void Run(bool firstRun)
                     t.Then(task, taskIsTopOfChain: true);
                 };
 
-            setupTask.Then(initializeGitTask).Start();
+            setupTask.Start();
         }
 
         public ITask InitializeRepository()

src/GitHub.Api/GitHub.Api.csproj

@@ -135,7 +135,6 @@
     <Compile Include="Git\GitStatusEntry.cs" />
     <Compile Include="Git\IGitObjectFactory.cs" />
     <Compile Include="Git\Tasks\GitRevertTask.cs" />
-    <Compile Include="IO\FileSystemHelpers.cs" />
     <Compile Include="Application\IApplicationManager.cs" />
     <Compile Include="Tasks\ActionTask.cs" />
     <Compile Include="Tasks\BaseOutputProcessor.cs" />

src/GitHub.Api/IO/FileSystemHelpers.cs

@@ -174,7 +174,7 @@ private FuncTask<NPath> ExtractPortableGit(GitInstallationState state)
                     source.Move(target);
                     state.GitExists = installDetails.GitExecutablePath.FileExists();
                     state.GitIsValid = s;
-                    return path;
+                    return target;
                 });
                 task = unzipTask;
             }
@@ -197,15 +197,15 @@ private FuncTask<NPath> ExtractPortableGit(GitInstallationState state)
                     source.Move(target);
                     state.GitExists = target.FileExists();
                     state.GitIsValid = s;
-                    return path;
+                    return target;
                 });
                 task = task?.Then(unzipTask) ?? unzipTask;
             }
 
             return task.Finally(new FuncTask<NPath>(cancellationToken, (success) =>
             {
                 tempZipExtractPath.DeleteIfExists();
-                return installDetails.GitInstallationPath;
+                return installDetails.GitExecutablePath;
             }));
         }
 

src/GitHub.Api/Installer/GitInstaller.cs

@@ -68,7 +68,6 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Auth\LoginTests.cs" />
     <Compile Include="Download\BaseTestWithHttpServer.cs" />
     <Compile Include="Download\DownloadTaskTests.cs" />
     <Compile Include="Events\RepositoryManagerTests.cs" />
@@ -141,6 +140,9 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Auth\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

src/tests/IntegrationTests/Auth/LoginTests.cs

@@ -92,7 +92,6 @@
     <Compile Include="IO\MacBasedGitEnvironmentTests.cs" />
     <Compile Include="IO\LinuxBasedGitEnvironmentTests.cs" />
     <Compile Include="IO\WindowsGitEnvironmentTests.cs" />
-    <Compile Include="IO\FileSystemHelperTests.cs" />
     <Compile Include="Primitives\UriStringTests.cs" />
     <Compile Include="ProcessManagerExtensions.cs" />
     <Compile Include="SetUpFixture.cs" />