escape activation script path if spaces

Author: brianignacio5

export.bat

@@ -17,8 +17,7 @@
  */
 
 import { EOL } from "os";
-import { OutputChannel } from "../logger/outputChannel";
-import { execChildProcess } from "../utils";
+import { spawn } from "../utils";
 import { IdfSetup } from "./types";
 import { getEnvVarsFromIdfTools } from "../pythonManager";
 import { IdfToolsManager } from "../idfToolsManager";
@@ -53,25 +52,24 @@ export async function getEnvVariablesFromActivationScript(
             "-ExecutionPolicy",
             "Bypass",
             "-NoProfile",
-            activationScriptPath,
+            `'${activationScriptPath.replace(/'/g, "''")}'`,
             "-e",
           ]
-        : [activationScriptPath, "-e"];
+        : [`"${activationScriptPath}"`, "-e"];
     const shellPath =
       process.platform === "win32"
         ? "C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe"
         : "/bin/sh";
-    const envVarsOutput = await execChildProcess(
+    const envVarsOutput = await spawn(
       shellPath,
       args,
-      process.cwd(),
-      logToChannel ? OutputChannel.init() : undefined,
       {
         maxBuffer: 500 * 1024,
         cwd: process.cwd(),
+        shell: shellPath
       }
     );
-    const envVars = envVarsOutput.split(EOL);
+    const envVars = envVarsOutput.toString().trim().split(EOL);
     let envDict: { [key: string]: string } = {};
     for (const envVar of envVars) {
       let keyIndex = envVar.indexOf("=");

src/eim/loadSettings.ts

@@ -4087,23 +4087,27 @@ function createIdfTerminal(extensionPath: string) {
         shellArgs = ["-ExecutionPolicy", "Bypass"];
       }
     }
+    const shellPath =
+      process.platform === "win32"
+        ? "C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe"
+        : vscode.env.shell;
     const espIdfTerminal = vscode.window.createTerminal({
       name: "ESP-IDF Terminal",
       env: modifiedEnv,
       cwd: workspaceRoot.fsPath || modifiedEnv.IDF_PATH || process.cwd(),
       strictEnv: true,
       shellArgs,
-      shellPath: vscode.env.shell,
+      shellPath: shellPath,
     });
+    const currentSetup = await getCurrentIdfSetup(workspaceRoot);
+    const activationScriptPathExists = await pathExists(
+      currentSetup.activationScript
+    );
+    const activationScriptPath = activationScriptPathExists
+      ? currentSetup.activationScript
+      : path.join(extensionPath, "export.ps1");
     if (process.platform === "win32") {
-      if (vscode.env.shell.indexOf("cmd.exe") !== -1) {
-        espIdfTerminal.sendText(path.join(extensionPath, "export.bat"));
-      } else if (
-        vscode.env.shell.indexOf("powershell") !== -1 ||
-        vscode.env.shell.indexOf("pwsh") !== -1
-      ) {
-        espIdfTerminal.sendText(path.join(extensionPath, "export.ps1"));
-      }
+      espIdfTerminal.sendText(`'${activationScriptPath.replace(/'/g, "''")}'`);
     }
     espIdfTerminal.show();
   });