mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-01-22 17:13:07 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

[EnvVar]Do not expand variables when looking for backup variables (#29431)

Browse Source 
* [EnvVar] Do not expand when looking for backup variable

* Revert unneeded change
This commit is contained in:
Stefan Markovic 2023-10-26 12:01:26 +02:00 committed by GitHub
parent 04a7adf6a4
commit 1dde699688
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/modules/EnvironmentVariables/EnvironmentVariables/Helpers/EnvironmentVariablesHelper.cs
View File

@ -21,25 +21,25 @@ namespace EnvironmentVariables.Helpers
internal static Variable GetExisting(string variableName) internal static Variable GetExisting(string variableName)
{ {
var userVariables = Environment.GetEnvironmentVariables(EnvironmentVariableTarget.User); DefaultVariablesSet userSet = new DefaultVariablesSet(Guid.NewGuid(), "tmpUser", VariablesSetType.User);
GetVariables(EnvironmentVariableTarget.User, userSet);
foreach (DictionaryEntry variable in userVariables) foreach (var variable in userSet.Variables)
{ {
var key = variable.Key as string; if (variable.Name.Equals(variableName, StringComparison.OrdinalIgnoreCase))
if (key.Equals(variableName, StringComparison.OrdinalIgnoreCase))
{ {
return new Variable(key, userVariables[key] as string, VariablesSetType.User); return new Variable(variable.Name, variable.Values, VariablesSetType.User);
} }
} }
var systemVariables = Environment.GetEnvironmentVariables(EnvironmentVariableTarget.Machine); DefaultVariablesSet systemSet = new DefaultVariablesSet(Guid.NewGuid(), "tmpSystem", VariablesSetType.System);
GetVariables(EnvironmentVariableTarget.Machine, systemSet);
foreach (DictionaryEntry variable in systemVariables) foreach (var variable in systemSet.Variables)
{ {
var key = variable.Key as string; if (variable.Name.Equals(variableName, StringComparison.OrdinalIgnoreCase))
if (key.Equals(variableName, StringComparison.OrdinalIgnoreCase))
{ {
return new Variable(key, systemVariables[key] as string, VariablesSetType.System); return new Variable(variable.Name, variable.Values, VariablesSetType.System);
} }
} }