From 56c4affac3b17f25e3044e67946234971cec5fdf Mon Sep 17 00:00:00 2001
From: Robert Holt <rjmholt_msft@outlook.com>
Date: Tue, 23 Feb 2021 14:27:59 -0800
Subject: [PATCH] Fix PowerShell MSIX (Store) detection

---
 src/platform.ts | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/platform.ts b/src/platform.ts
index e2c4244694..a8ab051b05 100644
--- a/src/platform.ts
+++ b/src/platform.ts
@@ -268,7 +268,7 @@ export class PowerShellExeFinder {
         // Find the base directory for MSIX application exe shortcuts
         const msixAppDir = path.join(process.env.LOCALAPPDATA, "Microsoft", "WindowsApps");
 
-        if (!fs.existsSync(msixAppDir)) {
+        if (!fileExistsSync(msixAppDir)) {
             return null;
         }
 
@@ -310,7 +310,13 @@ export class PowerShellExeFinder {
         const powerShellInstallBaseDir = path.join(programFilesPath, "PowerShell");
 
         // Ensure the base directory exists
-        if (!(fs.existsSync(powerShellInstallBaseDir) && fs.lstatSync(powerShellInstallBaseDir).isDirectory())) {
+        try {
+            const powerShellInstallBaseDirLStat = fs.lstatSync(powerShellInstallBaseDir);
+            if (!powerShellInstallBaseDirLStat.isDirectory())
+            {
+                return null;
+            }
+        } catch {
             return null;
         }
 
@@ -469,6 +475,17 @@ export function getWindowsSystemPowerShellPath(systemFolderName: string) {
         "powershell.exe");
 }
 
+function fileExistsSync(filePath: string): boolean {
+    try {
+        // This will throw if the path does not exist,
+        // and otherwise returns a value that we don't care about
+        fs.lstatSync(filePath);
+        return true;
+    } catch {
+        return false;
+    }
+}
+
 interface IPossiblePowerShellExe extends IPowerShellExeDetails {
     exists(): boolean;
 }
@@ -491,7 +508,7 @@ class PossiblePowerShellExe implements IPossiblePowerShellExe {
 
     public exists(): boolean {
         if (this.knownToExist === undefined) {
-            this.knownToExist = fs.existsSync(this.exePath);
+            this.knownToExist = fileExistsSync(this.exePath);
         }
         return this.knownToExist;
     }