Merge fixes/mac-path-variable into stanley/0.31-rc

Author: shana

src/GitHub.Api/Application/ApplicationManagerBase.cs

@@ -53,25 +53,26 @@ public void Run(bool firstRun)
         {
             Logger.Trace("Run - CurrentDirectory {0}", NPath.CurrentDirectory);
 
-            ITask<string> getMacEnvironmentPathTask;
+            ITask<string> setExistingEnvironmentPath;
             if (Environment.IsMac)
             {
-                getMacEnvironmentPathTask = new SimpleProcessTask(CancellationToken, "bash".ToNPath(), "-c \"/usr/libexec/path_helper\"")
-                           .Configure(ProcessManager)
+                setExistingEnvironmentPath = new SimpleProcessTask(CancellationToken, "bash".ToNPath(), "-c \"/usr/libexec/path_helper\"")
+                           .Configure(ProcessManager, dontSetupGit: true)
+                           .Catch(e => true) // make sure this doesn't throw if the task fails
                            .Then((success, path) => success ? path.Split(new[] { "\"" }, StringSplitOptions.None)[1] : null);
             }
             else
             {
-                getMacEnvironmentPathTask = new FuncTask<string>(CancellationToken, () => null);
+                setExistingEnvironmentPath = new FuncTask<string>(CancellationToken, () => null);
             }
 
-            var setMacEnvironmentPathTask = getMacEnvironmentPathTask.Then((_, path) => {
+            setExistingEnvironmentPath.OnEnd += (t, path, success, ex) => {
                 if (path != null)
                 {
-                    Logger.Trace("Mac Environment Path Original:{0} Updated:{1}", Environment.Path, path);
+                    Logger.Trace("Existing Environment Path Original:{0} Updated:{1}", Environment.Path, path);
                     Environment.Path = path;
                 }
-            });
+            };
 
             var initEnvironmentTask = new ActionTask<NPath>(CancellationToken,
                     (_, path) => InitializeEnvironment(path))
@@ -80,7 +81,7 @@ public void Run(bool firstRun)
             isBusy = true;
 
             var octorunInstaller = new OctorunInstaller(Environment, TaskManager);
-            var setupTask = setMacEnvironmentPathTask.Then(octorunInstaller.SetupOctorunIfNeeded());
+            var setupTask = setExistingEnvironmentPath.Then(octorunInstaller.SetupOctorunIfNeeded());
 
             var initializeGitTask = new FuncTask<NPath>(CancellationToken, () =>
                 {

src/GitHub.Api/Git/GitClient.cs

@@ -112,11 +112,6 @@ public GitClient(IEnvironment environment, IProcessManager processManager, Cance
 
         public ITask<ValidateGitInstallResult> ValidateGitInstall(NPath path, bool isCustomGit)
         {
-            if (!path.FileExists())
-            {
-                return new FuncTask<ValidateGitInstallResult>(TaskEx.FromResult(new ValidateGitInstallResult(false, null, null)));
-            }
-
             Version gitVersion = null;
             Version gitLfsVersion = null;
 
@@ -125,25 +120,20 @@ public ITask<ValidateGitInstallResult> ValidateGitInstall(NPath path, bool isCus
                     gitVersion?.CompareTo(Constants.MinimumGitVersion) >= 0 &&
                     gitLfsVersion?.CompareTo(Constants.MinimumGitLfsVersion) >= 0,
                     gitVersion, gitLfsVersion));
-              
-            var gitLfsVersionTask = new GitLfsVersionTask(cancellationToken)
-                .Configure(processManager, path, dontSetupGit: isCustomGit);
-            
-            gitLfsVersionTask
-                .Then((result, version) => {return gitLfsVersion = version;})
-                .Then(endTask, taskIsTopOfChain: true);
-
-            gitLfsVersionTask.Then(endTask, TaskRunOptions.OnFailure, taskIsTopOfChain:true);
-
-            var gitVersionTask = new GitVersionTask(cancellationToken)
-                .Configure(processManager, path, dontSetupGit: isCustomGit);
-
-            gitVersionTask
-                .Then((result, version) => { return gitVersion = version; })
-                .Then(gitLfsVersionTask, taskIsTopOfChain: true);
-            
-            gitVersionTask.Then(endTask, TaskRunOptions.OnFailure, taskIsTopOfChain:true);
 
+            if (path.FileExists())
+            {
+                var gitLfsVersionTask = new GitLfsVersionTask(cancellationToken)
+                    .Configure(processManager, path, dontSetupGit: isCustomGit);
+                gitLfsVersionTask.OnEnd += (t, v, _, __) => gitLfsVersion = v;
+                var gitVersionTask = new GitVersionTask(cancellationToken)
+                    .Configure(processManager, path, dontSetupGit: isCustomGit);
+                gitVersionTask.OnEnd += (t, v, _, __) => gitVersion = v;
+
+                gitVersionTask
+                    .Then(gitLfsVersionTask)
+                    .Finally(endTask);
+            }
             return endTask;
         }
 

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/GitPathView.cs

@@ -270,7 +270,7 @@ private void ValidateAndSetGitInstallPath(string value)
                 gitVersionErrorMessage = null;
 
                 GitClient.ValidateGitInstall(value.ToNPath(), true)
-                    .FinallyInUI((success, exception, result) =>
+                    .ThenInUI((success, result) =>
                     {
                         if (!success)
                         {