From 444f28dd24f4bffa3e0ee450e8fbbe30340086b4 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Tue, 14 Feb 2017 16:53:29 -0800
Subject: Add functions to find Program Files folders on the powershell side

---
 scripts/getProgramFiles32bit.ps1 | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 scripts/getProgramFiles32bit.ps1

(limited to 'scripts/getProgramFiles32bit.ps1')

diff --git a/scripts/getProgramFiles32bit.ps1 b/scripts/getProgramFiles32bit.ps1
new file mode 100644
index 000000000..fd7167191
--- /dev/null
+++ b/scripts/getProgramFiles32bit.ps1
@@ -0,0 +1,11 @@
+[CmdletBinding()]
+param(
+
+)
+
+if (Test-Path env:PROGRAMFILES`(X86`))
+{
+    return ${env:PROGRAMFILES(X86)}
+}
+
+return ${env:PROGRAMFILES}
\ No newline at end of file
-- 
cgit v1.2.3


From 60e67651c32060ada2a2bfd0d52366cf91ef86cb Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Fri, 24 Feb 2017 14:30:56 -0800
Subject: Improve functions that detect ProgramFiles in powershell

---
 scripts/getProgramFiles32bit.ps1 | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'scripts/getProgramFiles32bit.ps1')

diff --git a/scripts/getProgramFiles32bit.ps1 b/scripts/getProgramFiles32bit.ps1
index fd7167191..6b71915b1 100644
--- a/scripts/getProgramFiles32bit.ps1
+++ b/scripts/getProgramFiles32bit.ps1
@@ -3,9 +3,15 @@ param(
 
 )
 
-if (Test-Path env:PROGRAMFILES`(X86`))
+$out = ${env:PROGRAMFILES(X86)}
+if ($out -eq $null)
 {
-    return ${env:PROGRAMFILES(X86)}
+    $out = ${env:PROGRAMFILES}
 }
 
-return ${env:PROGRAMFILES}
\ No newline at end of file
+if ($out -eq $null)
+{
+    throw "Could not find [Program Files 32-bit]"
+}
+
+return $out
\ No newline at end of file
-- 
cgit v1.2.3