diff options
| author | Force Charlie <charlieio@outlook.com> | 2018-01-29 21:05:10 +0800 |
|---|---|---|
| committer | Force Charlie <charlieio@outlook.com> | 2018-01-29 21:05:10 +0800 |
| commit | 84c0bd3436b90d21c9cfb37a5ccb80518ed54af7 (patch) | |
| tree | f12fdad22d979afb9823e24e9791f50ada946368 /scripts | |
| parent | e6712779e7a0c8f34ed581131d80a639b28448a7 (diff) | |
| parent | 92f9f63df688cd238bccfc8404d242aadd00c1d7 (diff) | |
| download | vcpkg-84c0bd3436b90d21c9cfb37a5ccb80518ed54af7.tar.gz vcpkg-84c0bd3436b90d21c9cfb37a5ccb80518ed54af7.zip | |
Merge branch 'master' of https://github.com/Microsoft/vcpkg into curl_http2
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/VcpkgPowershellUtils-ClearEnvironment.ps1 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/VcpkgPowershellUtils-ClearEnvironment.ps1 b/scripts/VcpkgPowershellUtils-ClearEnvironment.ps1 index 5c922572b..0a133f5f8 100644 --- a/scripts/VcpkgPowershellUtils-ClearEnvironment.ps1 +++ b/scripts/VcpkgPowershellUtils-ClearEnvironment.ps1 @@ -1,8 +1,8 @@ # Capture environment variables for the System and User. Also add some special/built-in variables. # These will be used to synthesize a clean environment $specialEnvironmentMap = @{ "SystemDrive"=$env:SystemDrive; "SystemRoot"=$env:SystemRoot; "UserProfile"=$env:UserProfile } # These are built-in and not set in the registry -$machineEnvironmentMap = [Environment]::GetEnvironmentVariables('Machine') # HKEY_CURRENT_USER\Environment -$userEnvironmentMap = [Environment]::GetEnvironmentVariables('User') # HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment +$machineEnvironmentMap = [Environment]::GetEnvironmentVariables('Machine') # HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment +$userEnvironmentMap = [Environment]::GetEnvironmentVariables('User') # HKEY_CURRENT_USER\Environment # Identify the keySet of environment variable names $nameSet = ($specialEnvironmentMap.Keys + $machineEnvironmentMap.Keys + $userEnvironmentMap.Keys) | Sort-Object | Select-Object -Unique |