Simplify getting the environment path initially

Author: shana

src/GitHub.Api/Application/ApplicationManagerBase.cs

@@ -53,25 +53,25 @@ 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)
                            .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 +80,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, () =>
                 {