'Please use yarn to install dependencies.' when using yarn. Fixes microsoft#93119

aeschli · aeschli · commit 5712574281bb · 2020-03-21T14:12:08.000+01:00
diff --git a/build/npm/preinstall.js b/build/npm/preinstall.js
@@ -23,7 +23,7 @@ if (majorYarnVersion < 1 || minorYarnVersion < 10) {
 	err = true;
 }
 
-if (!/yarn\.js$|yarnpkg$/.test(process.env['npm_execpath'])) {
+if (!/yarn[\w-.]*\.js$|yarnpkg$/.test(process.env['npm_execpath'])) {
 	console.error('\033[1;31m*** Please use yarn to install dependencies.\033[0;0m');
 	err = true;
 }

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ if (majorYarnVersion < 1 \|\| minorYarnVersion < 10) {`
`23`	`23`	`err = true;`
`24`	`24`	`}`
`25`	`25`
`26`		`-if (!/yarn\.js$\|yarnpkg$/.test(process.env['npm_execpath'])) {`
	`26`	`+if (!/yarn[\w-.]*\.js$\|yarnpkg$/.test(process.env['npm_execpath'])) {`
`27`	`27`	`console.error('\033[1;31m*** Please use yarn to install dependencies.\033[0;0m');`
`28`	`28`	`err = true;`
`29`	`29`	`}`