Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Make sure the correct environment variables are being read #1045

Merged
merged 2 commits into from
May 21, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions src/GitHub.Api/Platform/DefaultEnvironment.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using GitHub.Logging;
using System;
using System.Globalization;
using System.IO;
using System.Linq;

Expand Down Expand Up @@ -116,12 +117,25 @@ public string GetSpecialFolder(Environment.SpecialFolder folder)

public string ExpandEnvironmentVariables(string name)
{
return Environment.ExpandEnvironmentVariables(name);
var key = GetEnvironmentVariableKey(name);
return Environment.ExpandEnvironmentVariables(key);
}

public string GetEnvironmentVariable(string variable)
public string GetEnvironmentVariable(string name)
{
return Environment.GetEnvironmentVariable(variable);
var key = GetEnvironmentVariableKey(name);
return Environment.GetEnvironmentVariable(key);
}

public string GetEnvironmentVariableKey(string name)
{
return GetEnvironmentVariableKeyInternal(name);
}

private static string GetEnvironmentVariableKeyInternal(string name)
{
return Environment.GetEnvironmentVariables().Keys.Cast<string>()
.FirstOrDefault(k => string.Compare(name, k, true, CultureInfo.InvariantCulture) == 0) ?? name;
}

public NPath LogPath { get; }
Expand All @@ -134,7 +148,7 @@ public string GetEnvironmentVariable(string variable)
public NPath ExtensionInstallPath { get; set; }
public NPath UserCachePath { get; set; }
public NPath SystemCachePath { get; set; }
public string Path { get; set; } = Environment.GetEnvironmentVariable("PATH");
public string Path { get; set; } = Environment.GetEnvironmentVariable(GetEnvironmentVariableKeyInternal("PATH"));

public string NewLine => Environment.NewLine;
public NPath OctorunScriptPath
Expand Down
1 change: 1 addition & 0 deletions src/GitHub.Api/Platform/IEnvironment.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,6 @@ public interface IEnvironment
ISettings LocalSettings { get; }
ISettings SystemSettings { get; }
ISettings UserSettings { get; }
string GetEnvironmentVariableKey(string name);
}
}
12 changes: 6 additions & 6 deletions src/GitHub.Api/Platform/ProcessEnvironment.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using GitHub.Logging;
using System;
using System.Collections.Generic;
using System.Diagnostics;

Expand All @@ -24,11 +23,12 @@ public void Configure(ProcessStartInfo psi, NPath workingDirectory, bool dontSet

var path = Environment.Path;
psi.EnvironmentVariables["GHU_WORKINGDIR"] = workingDirectory;
var pathEnvVarKey = Environment.GetEnvironmentVariableKey("PATH");

if (dontSetupGit)
{
psi.EnvironmentVariables["GHU_FULLPATH"] = path;
psi.EnvironmentVariables["PATH"] = path;
psi.EnvironmentVariables[pathEnvVarKey] = path;
return;
}

Expand Down Expand Up @@ -87,10 +87,10 @@ public void Configure(ProcessStartInfo psi, NPath workingDirectory, bool dontSet

pathEntries.Add("END");

path = String.Join(separator, pathEntries.ToArray()) + separator + path;
path = string.Join(separator, pathEntries.ToArray()) + separator + path;

psi.EnvironmentVariables["GHU_FULLPATH"] = path;
psi.EnvironmentVariables["PATH"] = path;
psi.EnvironmentVariables[pathEnvVarKey] = path;

//TODO: Remove with Git LFS Locking becomes standard
psi.EnvironmentVariables["GITLFSLOCKSENABLED"] = "1";
Expand All @@ -102,11 +102,11 @@ public void Configure(ProcessStartInfo psi, NPath workingDirectory, bool dontSet
}

var httpProxy = Environment.GetEnvironmentVariable("HTTP_PROXY");
if (!String.IsNullOrEmpty(httpProxy))
if (!string.IsNullOrEmpty(httpProxy))
psi.EnvironmentVariables["HTTP_PROXY"] = httpProxy;

var httpsProxy = Environment.GetEnvironmentVariable("HTTPS_PROXY");
if (!String.IsNullOrEmpty(httpsProxy))
if (!string.IsNullOrEmpty(httpsProxy))
psi.EnvironmentVariables["HTTPS_PROXY"] = httpsProxy;
psi.EnvironmentVariables["DISPLAY"] = "0";
}
Expand Down
17 changes: 15 additions & 2 deletions src/tests/IntegrationTests/IntegrationTestEnvironment.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using System.Globalization;
using System.Linq;
using GitHub.Unity;
using GitHub.Logging;

Expand Down Expand Up @@ -60,7 +61,7 @@ public void InitializeRepository(NPath? expectedPath = null)

public string ExpandEnvironmentVariables(string name)
{
return name;
return defaultEnvironment.ExpandEnvironmentVariables(name);
}

public string GetEnvironmentVariable(string v)
Expand All @@ -73,6 +74,18 @@ public string GetEnvironmentVariable(string v)
return environmentVariable;
}


public string GetEnvironmentVariableKey(string name)
{
return defaultEnvironment.GetEnvironmentVariableKey(name);
}

private static string GetEnvironmentVariableKeyInternal(string name)
{
return Environment.GetEnvironmentVariables().Keys.Cast<string>()
.FirstOrDefault(k => string.Compare(name, k, true, CultureInfo.InvariantCulture) == 0) ?? name;
}

public string GetSpecialFolder(Environment.SpecialFolder folder)
{
var ensureDirectoryExists = UserCachePath.Parent.EnsureDirectoryExists(folder.ToString());
Expand All @@ -88,7 +101,7 @@ public string GetSpecialFolder(Environment.SpecialFolder folder)

public string UserProfilePath => UserCachePath.Parent.CreateDirectory("user profile path");

public string Path { get; set; } = Environment.GetEnvironmentVariable("PATH").ToNPath();
public string Path { get; set; } = Environment.GetEnvironmentVariable(GetEnvironmentVariableKeyInternal("PATH"));

public string NewLine => Environment.NewLine;
public string UnityVersion => "5.6";
Expand Down