mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2024-12-12 18:29:24 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

[Run] Fix environment helper for nested environment variables (#27034)

Browse Source 
* Updates to EnvironmentHelper

* Revert "Updates to EnvironmentHelper"

This reverts commit 8af2441c34.

* Environment helper fix

* clean up usings

* fix spelling

* Update comment

* Update src/modules/launcher/PowerLauncher/Helper/EnvironmentHelper.cs

* Update src/modules/launcher/PowerLauncher/Helper/EnvironmentHelper.cs
This commit is contained in:
Heiko 2023-06-28 11:44:13 +02:00 committed by GitHub
parent 6ba8596d52
commit 63c624b273
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/modules/launcher/PowerLauncher/Helper/EnvironmentHelper.cs
View File

@ -68,12 +68,23 @@ namespace PowerLauncher.Helper
}
/// <summary>
/// This method updates the environment of PT Run's process when called. It is called when we receive a special WindowMessage.
/// This method is used as a function wrapper to do the update twice. We have to do it twice to get correct variable sets if they contain nested variables (e.g. PATH contains %JAVA_HOME%).
/// It is called when we receive a special WindowMessage.
/// </summary>
internal static void UpdateEnvironment()
{
Stopwatch.Normal("EnvironmentHelper.UpdateEnvironment - Duration cost", () =>
{
ExecuteEnvironmentUpdate();
ExecuteEnvironmentUpdate();
});
}
/// <summary>
/// This method updates the environment of PT Run's process when called.
/// </summary>
private static void ExecuteEnvironmentUpdate()
{
// Caching existing process environment and getting updated environment variables
IDictionary oldProcessEnvironment = GetEnvironmentVariablesWithErrorLog(EnvironmentVariableTarget.Process);
var newEnvironment = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
@ -151,7 +162,6 @@ namespace PowerLauncher.Helper
Log.Error($"Failed to update the environment variable [{kv.Key}] for the PT Run process. Their name is null or empty. (The variable value has a length of [{varValueLength}].)", typeof(PowerLauncher.Helper.EnvironmentHelper));
}
}
});
}
/// <summary>