fix(@angular/cli): fix PWD in cygwin

Fix #10232
angular · May 10, 2018 · b9c40ee · b9c40ee
1 parent 325baa6
commit b9c40ee
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 9 deletions.
diff --git a/packages/@angular/cli/lib/cli/index.ts b/packages/@angular/cli/lib/cli/index.ts
@@ -1,4 +1,3 @@
-import * as path from 'path';
 import { filter } from 'rxjs/operators';
 import { logging, terminal } from '@angular-devkit/core';
 import { runCommand } from '../../models/command-runner';
@@ -41,10 +40,6 @@ function loadCommands() {
 }
 
 export default async function(options: any) {
-  // ensure the environemnt variable for dynamic paths
-  process.env.PWD = path.normalize(process.env.PWD || process.cwd());
-  process.env.CLI_ROOT = process.env.CLI_ROOT || path.resolve(__dirname, '..', '..');
-
   const commands = loadCommands();
 
   const logger = new logging.IndentLogger('cling');

diff --git a/packages/@angular/cli/models/schematic-command.ts b/packages/@angular/cli/models/schematic-command.ts
@@ -97,8 +97,7 @@ export abstract class SchematicCommand extends Command {
        },
     );
 
-    const cwd = process.env.PWD;
-    const workingDir = cwd.replace(this.project.root, '').replace(/\\/g, '/');
+    const workingDir = process.cwd().replace(this.project.root, '').replace(/\\/g, '/');
     const pathOptions = this.setPathOptions(schematicOptions, workingDir);
     schematicOptions = { ...schematicOptions, ...pathOptions };
     const defaultOptions = this.readDefaults(collectionName, schematicName, schematicOptions);

diff --git a/tests/e2e/utils/process.ts b/tests/e2e/utils/process.ts
@@ -171,8 +171,6 @@ export function execAndWaitForOutputToMatch(cmd: string, args: string[], match:
 
 let npmInstalledEject = false;
 export function ng(...args: string[]) {
-  process.env.PWD = process.cwd();
-
   const argv = getGlobalVariable('argv');
   const maybeSilentNg = argv['nosilent'] ? noSilentNg : silentNg;
   if (['build', 'serve', 'test', 'e2e', 'xi18n'].indexOf(args[0]) != -1) {