Skip to content

Commit 6ac97b7

Browse files
committed
fix: refresh terminal environment from registry to avoid stale env
Signed-off-by: weiningwei <weiningwei09@gmail.com>
1 parent c7ce88c commit 6ac97b7

1 file changed

Lines changed: 32 additions & 1 deletion

File tree

‎src/Native/Windows.cs‎

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,41 @@ public void OpenTerminal(string workdir, string args)
159159
startInfo.WorkingDirectory = cwd;
160160
startInfo.FileName = terminal;
161161
startInfo.Arguments = args;
162-
startInfo.UseShellExecute = true;
162+
RefreshEnvFromRegistry(startInfo);
163163
Process.Start(startInfo);
164164
}
165165

166+
private static void RefreshEnvFromRegistry(ProcessStartInfo startInfo)
167+
{
168+
// Read latest machine and user environment from registry, so that
169+
// environment changes made after SourceGit started are picked up.
170+
var machine = Environment.GetEnvironmentVariables(EnvironmentVariableTarget.Machine);
171+
var user = Environment.GetEnvironmentVariables(EnvironmentVariableTarget.User);
172+
173+
foreach (System.Collections.DictionaryEntry kv in machine)
174+
startInfo.Environment[kv.Key.ToString()] = kv.Value?.ToString() ?? "";
175+
176+
foreach (System.Collections.DictionaryEntry kv in user)
177+
{
178+
var key = kv.Key.ToString();
179+
var value = kv.Value?.ToString() ?? "";
180+
if (string.Equals(key, "Path", StringComparison.OrdinalIgnoreCase) && startInfo.Environment.TryGetValue(key, out var existing))
181+
startInfo.Environment[key] = existing + ";" + value;
182+
else
183+
startInfo.Environment[key] = value;
184+
}
185+
186+
// Preserve dynamic process-only variables not stored in registry
187+
// (e.g. TEMP, USERNAME, COMPUTERNAME, PROCESSOR_*)
188+
var proc = Environment.GetEnvironmentVariables(EnvironmentVariableTarget.Process);
189+
foreach (System.Collections.DictionaryEntry kv in proc)
190+
{
191+
var key = kv.Key.ToString();
192+
if (!startInfo.Environment.ContainsKey(key))
193+
startInfo.Environment[key] = kv.Value?.ToString() ?? "";
194+
}
195+
}
196+
166197
public void OpenInFileManager(string path)
167198
{
168199
if (File.Exists(path))

0 commit comments

Comments
 (0)