fix(windows): Properly escpae spaces in powershell with backticks (#890)

nrwl · Nov 15, 2019 · 919ca16 · 919ca16
1 parent 105fb64
commit 919ca16
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/apps/vscode/src/app/ng-task/shell-execution.ts b/apps/vscode/src/app/ng-task/shell-execution.ts
@@ -31,7 +31,7 @@ function getWin32ShellExecution(config: ShellConfig): ShellExecution {
     shellArgs: [
       `-Sta -NoLogo -NonInteractive -C "& {${config.program.replace(
         / /g,
-        '\\ '
+        '` ' // NOTE: In powershell ` is the escape key.
       )} ${config.args.join(' ')}}"`
     ]
   });

diff --git a/apps/vscode/src/main.ts b/apps/vscode/src/main.ts
@@ -163,7 +163,7 @@ function scanForWorkspace(vscodeWorkspacePath: string) {
     currentDirectory = dirname(currentDirectory);
   }
 
-  const childAngularJsonStream = stream(join('**', 'angular.json'), {
+  const childAngularJsonStream = stream('**/angular.json', {
     cwd: vscodeWorkspacePath,
     deep: 3,
     onlyFiles: true,

diff --git a/libs/vscode-ui/feature-task-execution-form/src/lib/task-execution-form.component.ts b/libs/vscode-ui/feature-task-execution-form/src/lib/task-execution-form.component.ts
@@ -373,5 +373,5 @@ export class TaskExecutionFormComponent implements OnInit, AfterViewChecked {
 
 function sanitizeWhitespace(value: string) {
   const trimmed = value.trim();
-  return /\s/.test(trimmed) ? `"${trimmed}"` : trimmed;
+  return /\s/.test(trimmed) ? `'${trimmed}'` : trimmed; // NOTE: We use ' rather than " for powershell compatibility
 }