Explicitely set git/lfs installation paths in the environment

Author: shana

src/GitHub.Api/Application/ApplicationManagerBase.cs

@@ -137,7 +137,9 @@ public void SetupGit(GitInstaller.GitInstallationState state)
             if (!(state.GitIsValid && state.GitLfsIsValid))
                 return;
 
+            Environment.GitInstallPath = state.GitInstallationPath;
             Environment.GitExecutablePath = state.GitExecutablePath;
+            Environment.GitLfsInstallPath = state.GitLfsInstallationPath;
             Environment.GitLfsExecutablePath = state.GitLfsExecutablePath;
             Environment.IsCustomGitExecutable = state.IsCustomGitPath;
             Environment.User.Initialize(GitClient);

src/GitHub.Api/Platform/DefaultEnvironment.cs

@@ -12,8 +12,6 @@ public class DefaultEnvironment : IEnvironment
         private static bool? onLinux;
         private static bool? onMac;
 
-        private NPath gitExecutablePath;
-        private NPath gitLfsExecutablePath;
         private NPath nodeJsExecutablePath;
         private NPath octorunScriptPath;
 
@@ -154,28 +152,11 @@ public NPath OctorunScriptPath
 
         public bool IsCustomGitExecutable { get; set; }
 
-        public NPath GitExecutablePath
-        {
-            get { return gitExecutablePath; }
-            set
-            {
-                gitExecutablePath = value;
-                if (!gitExecutablePath.IsInitialized)
-                    GitInstallPath = NPath.Default;
-                else
-                    GitInstallPath = GitExecutablePath.Resolve().Parent.Parent;
-            }
-        }
+        public NPath GitInstallPath { get; set; }
+        public NPath GitExecutablePath { get; set; }
 
-        public NPath GitLfsExecutablePath
-        {
-            get { return gitLfsExecutablePath; }
-            set
-            {
-                gitLfsExecutablePath = value;
-                GitLfsInstallPath = gitLfsExecutablePath.IsInitialized ? gitLfsExecutablePath.Parent : NPath.Default;
-            }
-        }
+        public NPath GitLfsInstallPath { get; set; }
+        public NPath GitLfsExecutablePath { get; set; }
 
         public NPath NodeJsExecutablePath
         {
@@ -190,8 +171,6 @@ public NPath NodeJsExecutablePath
                 return nodeJsExecutablePath;
             }
         }
-        public NPath GitInstallPath { get; private set; }
-        public NPath GitLfsInstallPath { get; private set; }
         public NPath RepositoryPath { get; private set; }
         public ICacheContainer CacheContainer { get; private set; }
         public IRepository Repository { get; set; }

src/GitHub.Api/Platform/IEnvironment.cs

@@ -26,7 +26,9 @@ public interface IEnvironment
         NPath UnityProjectPath { get; }
         NPath ExtensionInstallPath { get; }
         NPath RepositoryPath { get; }
-        NPath GitInstallPath { get; }
+        NPath GitInstallPath { get; set; }
+        NPath GitLfsInstallPath { get; set; }
+        NPath GitLfsExecutablePath { get; set; }
         NPath UserCachePath { get; set; }
         NPath SystemCachePath { get; set; }
         NPath LogPath { get; }
@@ -35,8 +37,6 @@ public interface IEnvironment
         IRepository Repository { get; set; }
         string ExecutableExtension { get; }
         ICacheContainer CacheContainer { get; }
-        NPath GitLfsInstallPath { get; }
-        NPath GitLfsExecutablePath { get; set; }
         ISettings LocalSettings { get; }
         ISettings SystemSettings { get; }
         ISettings UserSettings { get; }

src/GitHub.Api/Platform/ProcessEnvironment.cs

@@ -39,7 +39,7 @@ public void Configure(ProcessStartInfo psi, NPath workingDirectory, bool dontSet
 
             if (Environment.GitInstallPath.IsInitialized)
             {
-                var gitPathRoot = Environment.GitInstallPath;
+                var gitPathRoot = Environment.GitExecutablePath.Resolve().Parent.Parent;
                 var gitExecutableDir = Environment.GitExecutablePath.Parent; // original path to git (might be different from install path if it's a symlink)
 
                 var baseExecPath = gitPathRoot;

src/tests/IntegrationTests/BaseIntegrationTest.cs

@@ -125,7 +125,10 @@ protected IEnvironment InitializePlatformAndEnvironment(NPath repoPath,
         protected void SetupGit(NPath pathToSetupGitInto, string testName)
         {
             var installDetails = new GitInstaller.GitInstallDetails(pathToSetupGitInto, Environment.IsWindows);
+            Environment.GitInstallPath = installDetails.GitInstallationPath;
             Environment.GitExecutablePath = installDetails.GitExecutablePath;
+            Environment.GitLfsInstallPath = installDetails.GitInstallationPath;
+            Environment.GitLfsExecutablePath = installDetails.GitLfsExecutablePath;
             GitClient = new GitClient(Environment, ProcessManager, TaskManager.Token);
 
             if (installDetails.GitExecutablePath.FileExists() && installDetails.GitLfsExecutablePath.FileExists())

src/tests/IntegrationTests/Installer/GitInstallerTests.cs

@@ -64,19 +64,18 @@ public void GitInstallWindows()
             ZipHelper.Instance = zipHelper;
             var gitInstaller = new GitInstaller(Environment, ProcessManager, TaskManager.Token, null, installDetails: installDetails);
 
-            var result = gitInstaller.SetupGitIfNeeded();
-            result.Should().NotBeNull();
-
-            Assert.AreEqual(gitInstallationPath.Combine(installDetails.PackageNameWithVersion), result.GitInstallationPath);
-            result.GitExecutablePath.Should().Be(gitInstallationPath.Combine(installDetails.PackageNameWithVersion, "cmd", "git" + Environment.ExecutableExtension));
-            result.GitLfsExecutablePath.Should().Be(gitInstallationPath.Combine(installDetails.PackageNameWithVersion, "mingw32", "libexec", "git-core", "git-lfs" + Environment.ExecutableExtension));
-
-            var isCustomGitExec = result.GitExecutablePath != result.GitExecutablePath;
+            var state = gitInstaller.SetupGitIfNeeded();
+            state.Should().NotBeNull();
 
-            Environment.GitExecutablePath = result.GitExecutablePath;
-            Environment.GitLfsExecutablePath = result.GitLfsExecutablePath;
+            Assert.AreEqual(gitInstallationPath.Combine(installDetails.PackageNameWithVersion), state.GitInstallationPath);
+            state.GitExecutablePath.Should().Be(gitInstallationPath.Combine(installDetails.PackageNameWithVersion, "cmd", "git" + Environment.ExecutableExtension));
+            state.GitLfsExecutablePath.Should().Be(gitInstallationPath.Combine(installDetails.PackageNameWithVersion, "mingw32", "libexec", "git-core", "git-lfs" + Environment.ExecutableExtension));
 
-            Environment.IsCustomGitExecutable = isCustomGitExec;
+            Environment.GitInstallPath = state.GitInstallationPath;
+            Environment.GitExecutablePath = state.GitExecutablePath;
+            Environment.GitLfsInstallPath = state.GitLfsInstallationPath;
+            Environment.GitLfsExecutablePath = state.GitLfsExecutablePath;
+            Environment.IsCustomGitExecutable = state.IsCustomGitPath;
 
             var procTask = new SimpleProcessTask(TaskManager.Token, "something")
                 .Configure(ProcessManager);
@@ -251,11 +250,11 @@ public void GitLfsIsInstalledIfMissingWithCustomGitPath()
             state.GitLfsExecutablePath.Should().Be(gitLfsExec);
             gitLfsExec.FileExists().Should().BeTrue();
 
-            var isCustomGitExec = state.GitExecutablePath != installDetails.GitExecutablePath;
-
+            Environment.GitInstallPath = state.GitInstallationPath;
             Environment.GitExecutablePath = state.GitExecutablePath;
+            Environment.GitLfsInstallPath = state.GitLfsInstallationPath;
             Environment.GitLfsExecutablePath = state.GitLfsExecutablePath;
-            Environment.IsCustomGitExecutable = isCustomGitExec;
+            Environment.IsCustomGitExecutable = state.IsCustomGitPath;
 
             var procTask = new SimpleProcessTask(TaskManager.Token, "something")
                 .Configure(ProcessManager);

src/tests/IntegrationTests/IntegrationTestEnvironment.cs

@@ -108,6 +108,11 @@ public NPath GitExecutablePath
             }
         }
 
+
+        public NPath GitInstallPath { get { return defaultEnvironment.GitInstallPath; } set { defaultEnvironment.GitInstallPath = value; } }
+        public NPath GitLfsInstallPath { get { return defaultEnvironment.GitLfsInstallPath; } set { defaultEnvironment.GitLfsInstallPath = value; } }
+        public NPath GitLfsExecutablePath { get { return defaultEnvironment.GitLfsExecutablePath; } set { defaultEnvironment.GitLfsExecutablePath = value; } }
+
         public NPath NodeJsExecutablePath => defaultEnvironment.NodeJsExecutablePath;
 
         public NPath OctorunScriptPath { get; set; }
@@ -132,10 +137,6 @@ public NPath GitExecutablePath
 
         public NPath RepositoryPath => defaultEnvironment.RepositoryPath;
 
-        public NPath GitInstallPath => defaultEnvironment.GitInstallPath;
-        public NPath GitLfsInstallPath => defaultEnvironment.GitLfsInstallPath;
-        public NPath GitLfsExecutablePath { get { return defaultEnvironment.GitLfsExecutablePath; } set { defaultEnvironment.GitLfsExecutablePath = value; } }
-
         public IRepository Repository { get { return defaultEnvironment.Repository; } set { defaultEnvironment.Repository = value; } }
         public IUser User { get { return defaultEnvironment.User; } set { defaultEnvironment.User = value; } }
         public IFileSystem FileSystem { get { return defaultEnvironment.FileSystem; } set { defaultEnvironment.FileSystem = value; } }

src/tests/TaskSystemIntegrationTests/Tests.cs

@@ -55,8 +55,10 @@ public void OneTimeSetup()
             var processEnv = platform.GitEnvironment;
             var path = new ProcessTask<NPath>(TaskManager.Token, new FirstLineIsPathOutputProcessor())
                 .Configure(ProcessManager, env.IsWindows ? "where" : "which", "git")
-                .Start().Result;
-            env.GitExecutablePath = path.IsInitialized ? path : "git".ToNPath();
+                .RunWithReturn(true);
+
+            env.GitInstallPath = path.Parent.Parent;
+            env.GitExecutablePath = path;
         }
 
         [TestFixtureTearDown]