@@ -290,7 +290,6 @@ export const run = (cwd: string, projectRoot: string, opts: any): void => {
290290
291291 checkForUntrackedFiles ( cb : EVCb < any > ) {
292292
293-
294293 if ( opts . ignore_dirty_git_index ) {
295294 return process . nextTick ( cb ) ;
296295 }
@@ -562,7 +561,7 @@ export const run = (cwd: string, projectRoot: string, opts: any): void => {
562561 log . info ( chalk . bold ( 'Running the following command from the copy project dir:' ) , chalk . cyan . bold ( cmd ) ) ;
563562
564563 const k = cp . spawn ( 'bash' , [ ] , {
565- env : Object . assign ( process . env , { } , {
564+ env : Object . assign ( { } , process . env , {
566565 PATH : path . resolve ( copyProject + '/node_modules/.bin' ) + ':' + process . env . PATH
567566 } )
568567 } ) ;
@@ -676,8 +675,8 @@ export const run = (cwd: string, projectRoot: string, opts: any): void => {
676675 }
677676
678677 // note that runNpmPack is the path to .tgz file
679- const cmd = `npm install --loglevel=warn --cache-min 9999999 --no-optional --production "${ runNpmPack } ";
680- npm i --loglevel=warn --cache-min 9999999 --no-optional --production;` ;
678+ const cmd = `npm install --loglevel=warn --cache-min 9999999 --no-optional --production "${ runNpmPack } ";\n` +
679+ ` npm i --loglevel=warn --cache-min 9999999 --no-optional --production;`;
681680
682681 log . info ( `Running the following command via this dir: "${ r2gProject } " ...` ) ;
683682 log . info ( chalk . blueBright ( cmd ) ) ;
@@ -729,7 +728,7 @@ export const run = (cwd: string, projectRoot: string, opts: any): void => {
729728 log . info ( `Running your exported r2gSmokeTest function(s) in "${ r2gProject } " ...` ) ;
730729
731730 const k = cp . spawn ( 'bash' , [ ] , {
732- env : Object . assign ( process . env , { } , {
731+ env : Object . assign ( { } , process . env , {
733732 PATH : path . resolve ( r2gProject + '/node_modules/.bin' ) + ':' + process . env . PATH
734733 } )
735734 } ) ;
@@ -781,7 +780,7 @@ export const run = (cwd: string, projectRoot: string, opts: any): void => {
781780 log . info ( `Running user defined tests in "${ r2gProject } /tests" ...` ) ;
782781
783782 const k = cp . spawn ( 'bash' , [ ] , {
784- env : Object . assign ( process . env , { } , {
783+ env : Object . assign ( { } , process . env , {
785784 PATH : path . resolve ( r2gProject + '/node_modules/.bin' ) + ':' + process . env . PATH
786785 } )
787786 } ) ;
0 commit comments