-
-
Notifications
You must be signed in to change notification settings - Fork 156
win: fix spawning npm #635
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,6 +2,7 @@ | |
| const path = require('path'); | ||
|
|
||
| const stripAnsi = require('strip-ansi'); | ||
| const which = require('which').sync; | ||
|
|
||
| const createOptions = require('../create-options'); | ||
| const spawn = require('../spawn'); | ||
|
|
@@ -12,7 +13,7 @@ function install(packageManager, context, next) { | |
| path.join(context.path, context.module.name), | ||
| context | ||
| ); | ||
| let args = ['install']; | ||
|
|
||
| context.emit( | ||
| 'data', | ||
| 'info', | ||
|
|
@@ -27,17 +28,26 @@ function install(packageManager, context, next) { | |
| `Using temp directory: "${options.env['npm_config_tmp']}"` | ||
| ); | ||
|
|
||
| if (context.module.install) { | ||
| args = args.concat(context.module.install); | ||
| let nodeBin = 'node'; | ||
| if (context.options.testPath) { | ||
| options.env.PATH = `${context.options.testPath}:${process.env.PATH}`; | ||
| nodeBin = which('node', { | ||
| path: options.env.PATH || process.env.PATH | ||
| }); | ||
| } | ||
|
|
||
| const packageManagerBin = | ||
| packageManager === 'npm' ? context.npmPath : context.yarnPath; | ||
|
|
||
| let args = [packageManagerBin, 'install']; | ||
| if (context.module.install) { | ||
| args = args.concat(context.module.install); | ||
| } | ||
|
|
||
| const binDirectory = path.dirname(packageManagerBin); | ||
| options.env.PATH = `${binDirectory}:${process.env.PATH}`; | ||
|
|
||
| const proc = spawn(packageManagerBin, args, options); | ||
| const proc = spawn(nodeBin, args, options); | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. does this still work if the package manager is a script? Say I halve aliased #!/usr/bin/env bash
node /path/to/npm.js --log-level=silly $0More real script - the recommended way of installing yarn on mac is through brew - and they use a script not a JS file. So node cannot execute the file. See #560 (comment) |
||
| const finish = timeout(context, proc, next, 'Install'); | ||
|
|
||
| proc.stderr.on('data', (chunk) => { | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can
options.env.PATHever not beprocess.env.PATHoutside of thisif? (i.e. does thenodeBincalculation need to occur outside of theifstatement?)