Merge branch 'stable'

* stable: (GH-828) Return OS bit width, not process
chocolatey · Jul 24, 2016 · 5ee2dd0 · 5ee2dd0
2 parents 18c43a3 + 45ccd77
commit 5ee2dd0
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/chocolatey.resources/helpers/functions/Get-OSArchitectureWidth.ps1 b/src/chocolatey.resources/helpers/functions/Get-OSArchitectureWidth.ps1
@@ -45,7 +45,9 @@ param(
   Write-Debug "Running 'Get-OSArchitectureWidth'"
 
   $bits = 64
-  if ([System.IntPtr]::Size -eq 4) {
+  if (([System.IntPtr]::Size -eq 4) -and (Test-Path env:\PROCESSOR_ARCHITEW6432)) {
+    $bits = 64
+  } elseif ([System.IntPtr]::Size -eq 4) {
     $bits = 32
   }