From 6ccd43dfa7bedbfe9323e13085a476cca5d616d5 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Sat, 19 May 2018 18:24:50 -0700
Subject: Rename ps1 file

---
 scripts/VcpkgPowershellUtils-ClearEnvironment.ps1 | 52 -----------------------
 scripts/bootstrap.ps1                             |  2 +-
 scripts/cleanEnvironmentHelper.ps1                | 52 +++++++++++++++++++++++
 3 files changed, 53 insertions(+), 53 deletions(-)
 delete mode 100644 scripts/VcpkgPowershellUtils-ClearEnvironment.ps1
 create mode 100644 scripts/cleanEnvironmentHelper.ps1

(limited to 'scripts')

diff --git a/scripts/VcpkgPowershellUtils-ClearEnvironment.ps1 b/scripts/VcpkgPowershellUtils-ClearEnvironment.ps1
deleted file mode 100644
index 0a133f5f8..000000000
--- a/scripts/VcpkgPowershellUtils-ClearEnvironment.ps1
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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_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
-
-# Any environment variable in the $nameSet should be restored to its original value
-foreach ($name in $nameSet)
-{
-    if ($specialEnvironmentMap.ContainsKey($name))
-    {
-        [Environment]::SetEnvironmentVariable($name, $specialEnvironmentMap[$name], 'Process')
-        continue;
-    }
-
-    # PATH needs to be concatenated as it has values in both machine and user environment. Any other values should be set.
-    if ($name -match 'path')
-    {
-        $pathValuePartial = @()
-        # Machine values before user values
-        $pathValuePartial += $machineEnvironmentMap[$name] -split ';'
-        $pathValuePartial += $userEnvironmentMap[$name] -split ';'
-        $pathValue = $pathValuePartial -join ';'
-        [Environment]::SetEnvironmentVariable($name, $pathValue, 'Process')
-        continue;
-    }
-
-    if ($userEnvironmentMap.ContainsKey($name))
-    {
-        [Environment]::SetEnvironmentVariable($name, $userEnvironmentMap[$name], 'Process')
-        continue;
-    }
-
-    if ($machineEnvironmentMap.ContainsKey($name))
-    {
-        [Environment]::SetEnvironmentVariable($name, $machineEnvironmentMap[$name], 'Process')
-        continue;
-    }
-
-    throw "Unreachable: Unknown variable $name"
-}
-
-# Any environment variable NOT in the $nameSet should be removed
-$processEnvironmentMap = [Environment]::GetEnvironmentVariables('Process')
-$variablesForRemoval = $processEnvironmentMap.Keys | Where-Object {$nameSet -notcontains $_}
-foreach ($name in $variablesForRemoval)
-{
-    [Environment]::SetEnvironmentVariable($name, $null, 'Process')
-}
diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1
index 43cf96c56..c37ffd57f 100644
--- a/scripts/bootstrap.ps1
+++ b/scripts/bootstrap.ps1
@@ -310,7 +310,7 @@ function vcpkgInvokeCommandClean()
 
     Write-Verbose "Clean-Executing: ${executable} ${arguments}"
     $scriptsDir = split-path -parent $script:MyInvocation.MyCommand.Definition
-    $cleanEnvScript = "$scriptsDir\VcpkgPowershellUtils-ClearEnvironment.ps1"
+    $cleanEnvScript = "$scriptsDir\cleanEnvironmentHelper.ps1"
     $tripleQuotes = "`"`"`""
     $argumentsWithEscapedQuotes = $arguments -replace "`"", $tripleQuotes
     $command = ". $tripleQuotes$cleanEnvScript$tripleQuotes; & $tripleQuotes$executable$tripleQuotes $argumentsWithEscapedQuotes"
diff --git a/scripts/cleanEnvironmentHelper.ps1 b/scripts/cleanEnvironmentHelper.ps1
new file mode 100644
index 000000000..0a133f5f8
--- /dev/null
+++ b/scripts/cleanEnvironmentHelper.ps1
@@ -0,0 +1,52 @@
+# 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_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
+
+# Any environment variable in the $nameSet should be restored to its original value
+foreach ($name in $nameSet)
+{
+    if ($specialEnvironmentMap.ContainsKey($name))
+    {
+        [Environment]::SetEnvironmentVariable($name, $specialEnvironmentMap[$name], 'Process')
+        continue;
+    }
+
+    # PATH needs to be concatenated as it has values in both machine and user environment. Any other values should be set.
+    if ($name -match 'path')
+    {
+        $pathValuePartial = @()
+        # Machine values before user values
+        $pathValuePartial += $machineEnvironmentMap[$name] -split ';'
+        $pathValuePartial += $userEnvironmentMap[$name] -split ';'
+        $pathValue = $pathValuePartial -join ';'
+        [Environment]::SetEnvironmentVariable($name, $pathValue, 'Process')
+        continue;
+    }
+
+    if ($userEnvironmentMap.ContainsKey($name))
+    {
+        [Environment]::SetEnvironmentVariable($name, $userEnvironmentMap[$name], 'Process')
+        continue;
+    }
+
+    if ($machineEnvironmentMap.ContainsKey($name))
+    {
+        [Environment]::SetEnvironmentVariable($name, $machineEnvironmentMap[$name], 'Process')
+        continue;
+    }
+
+    throw "Unreachable: Unknown variable $name"
+}
+
+# Any environment variable NOT in the $nameSet should be removed
+$processEnvironmentMap = [Environment]::GetEnvironmentVariables('Process')
+$variablesForRemoval = $processEnvironmentMap.Keys | Where-Object {$nameSet -notcontains $_}
+foreach ($name in $variablesForRemoval)
+{
+    [Environment]::SetEnvironmentVariable($name, $null, 'Process')
+}
-- 
cgit v1.2.3