JBDS-3838 Cannot install CDK

Use current process environment instead new one
redhat-developer-tooling · Apr 22, 2016 · ec344c1 · ec344c1
1 parent 7bf4fb9
commit ec344c1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/browser/model/cdk.js b/browser/model/cdk.js
@@ -175,14 +175,14 @@ class CDKInstall extends InstallableItem {
   }
 
   createEnvironment() {
-    let env = {};
-
-    //TODO Need to get this info from VagrantInstaller rather than hard code
+    let env = process.env;
     let vagrantInstall = this.installerDataSvc.getInstallable('vagrant');
     let vboxInstall = this.installerDataSvc.getInstallable('virtualbox');
     let vgrPath = vagrantInstall.getLocation();
     let vboxPath = vboxInstall.getLocation();
-    env['path'] = path.join(vgrPath,'bin') + ';' + vboxPath + ';';
+    env['path'] = env['path']
+      + path.delimiter + path.join(vgrPath,'bin')
+      + path.delimiter + vboxPath;
     return env;
   }
 

diff --git a/test/unit/model/cdk-test.js b/test/unit/model/cdk-test.js
@@ -198,10 +198,10 @@ describe('CDK installer', function() {
       expect(spy).calledWith(installer.cdkDownloadedFile, installerDataSvc.installDir());
     });
 
-    it('createEnvironment should return path to vagrant/bin', function() {
+    it('createEnvironment should return path with vagrant/bin', function() {
       let installer = new CDKInstall(installerDataSvc, 900, cdkUrl, cdkBoxUrl, ocUrl, pscpUrl, null);
       let env = installer.createEnvironment();
-      expect(env['path']).equal(path.join(installerDataSvc.vagrantDir(), 'bin') + ';' + installerDataSvc.vagrantDir() + ';');
+      expect(env['path']).includes(path.join(installerDataSvc.vagrantDir(), 'bin') + path.delimiter + installerDataSvc.vagrantDir());
     });
 
     it('setupVagrant should wait for vagrant install to complete', function() {