Merge branch 'dev'

electric-el · electric-el · commit 809f7e749d6e · 2024-06-08T06:48:03.000-04:00
diff --git a/run/install-base.js b/run/install-base.js
@@ -70,7 +70,7 @@ if (!fs.existsSync('node_modules')) {
     binNpm = 'npm.cmd';
   }
 
-  spawnedObj = spawnSync(binNpm, ['install', '--ignore-scripts'], {stdio: 'inherit'});
+  spawnedObj = spawnSync(binNpm, ['install', '--ignore-scripts'], {shell: true, stdio: 'inherit'});
 }
 
 if (spawnedObj && spawnedObj.stderr) {
@@ -113,12 +113,15 @@ if (isWindows) {
 }
 
 // Copy over the base profile source dir.
-const spawnedObj1 =
-  spawnSync(binGulp, ['--gulpfile', path.resolve(fepperPath, 'tasker.js'), 'install:copy-base'], {stdio: 'inherit'});
+const spawnedObj1 = spawnSync(
+  binGulp,
+  ['--gulpfile', path.resolve(fepperPath, 'tasker.js'), 'install:copy-base'],
+  {shell: true, stdio: 'inherit'}
+);
 
 if (spawnedObj1.stderr) {
   fs.appendFileSync(installLog, `${spawnedObj1.stderr}\n`);
 }
 
 // Complete installation. run/install.js handles its own logging so no need to log here.
-spawnSync('node', [path.resolve('run', 'install.js')], {stdio: 'inherit'});
+spawnSync('node', [path.resolve('run', 'install.js')], {shell: true, stdio: 'inherit'});
diff --git a/run/install.js b/run/install.js
@@ -37,7 +37,7 @@ if (!fs.existsSync(prefFile)) {
 }
 
 const argv = ['--gulpfile', taskerPath];
-const spawnedObj = spawnSync(binGulp, argv.concat(['install']), {stdio: 'inherit'});
+const spawnedObj = spawnSync(binGulp, argv.concat(['install']), {shell: true, stdio: 'inherit'});
 
 // Output to install.log.
 const installLog = 'install.log';
@@ -58,5 +58,5 @@ if (conf.ui && conf.ui.paths && conf.ui.paths.source && conf.ui.paths.source.roo
 }
 
 if (sourceDirContent.length) {
-  spawnSync(binGulp, argv.concat(['ui:compile']), {stdio: 'inherit'});
+  spawnSync(binGulp, argv.concat(['ui:compile']), {shell: true, stdio: 'inherit'});
 }

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ if (!fs.existsSync('node_modules')) {`
`70`	`70`	`binNpm = 'npm.cmd';`
`71`	`71`	`}`
`72`	`72`
`73`		`- spawnedObj = spawnSync(binNpm, ['install', '--ignore-scripts'], {stdio: 'inherit'});`
	`73`	`+ spawnedObj = spawnSync(binNpm, ['install', '--ignore-scripts'], {shell: true, stdio: 'inherit'});`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`if (spawnedObj && spawnedObj.stderr) {`
`@@ -113,12 +113,15 @@ if (isWindows) {`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`// Copy over the base profile source dir.`
`116`		`-const spawnedObj1 =`
`117`		`- spawnSync(binGulp, ['--gulpfile', path.resolve(fepperPath, 'tasker.js'), 'install:copy-base'], {stdio: 'inherit'});`
	`116`	`+const spawnedObj1 = spawnSync(`
	`117`	`+ binGulp,`
	`118`	`+ ['--gulpfile', path.resolve(fepperPath, 'tasker.js'), 'install:copy-base'],`
	`119`	`+ {shell: true, stdio: 'inherit'}`
	`120`	`+);`
`118`	`121`
`119`	`122`	`if (spawnedObj1.stderr) {`
`120`	`123`	fs.appendFileSync(installLog, `${spawnedObj1.stderr}\n`);
`121`	`124`	`}`
`122`	`125`
`123`	`126`	`// Complete installation. run/install.js handles its own logging so no need to log here.`
`124`		`-spawnSync('node', [path.resolve('run', 'install.js')], {stdio: 'inherit'});`
	`127`	`+spawnSync('node', [path.resolve('run', 'install.js')], {shell: true, stdio: 'inherit'});`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ if (!fs.existsSync(prefFile)) {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`const argv = ['--gulpfile', taskerPath];`
`40`		`-const spawnedObj = spawnSync(binGulp, argv.concat(['install']), {stdio: 'inherit'});`
	`40`	`+const spawnedObj = spawnSync(binGulp, argv.concat(['install']), {shell: true, stdio: 'inherit'});`
`41`	`41`
`42`	`42`	`// Output to install.log.`
`43`	`43`	`const installLog = 'install.log';`
`@@ -58,5 +58,5 @@ if (conf.ui && conf.ui.paths && conf.ui.paths.source && conf.ui.paths.source.roo`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`if (sourceDirContent.length) {`
`61`		`- spawnSync(binGulp, argv.concat(['ui:compile']), {stdio: 'inherit'});`
	`61`	`+ spawnSync(binGulp, argv.concat(['ui:compile']), {shell: true, stdio: 'inherit'});`
`62`	`62`	`}`