github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix process.env modify in place bug and extract currentEnvWithPathsAdded and getCurrentNodeBinDir

Browse Source
This commit is contained in:
Martijn Walraven
2015-07-20 17:32:48 -07:00
parent a41dcbbd66
commit a862d84142
2 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tools/files.js
View File

@@ -194,6 +194,10 @@ files.getDevBundle = function () {
return files.pathJoin(files.getCurrentToolsDir(), 'dev_bundle');
};
files.getCurrentNodeBinDir = function () {
return files.pathJoin(files.getDevBundle(), "bin");
}
// Return the top-level directory for this meteor install or checkout
files.getCurrentToolsDir = function () {
var dirname = files.convertToStandardPath(__dirname);
@@ -1173,6 +1177,17 @@ files.getHomeDir = function () {
}
};
files.currentEnvWithPathsAdded = function (...paths) {
const env = {...process.env};
const convertedPaths = paths.map(path => files.convertToOSPath(path));
let pathDecomposed = (env.PATH || "").split(files.pathOsDelimiter);
pathDecomposed.unshift(...convertedPaths);
env.PATH = pathDecomposed.join(files.pathOsDelimiter);
return env;
}
// add .bat extension to link file if not present
var ensureBatExtension = function (p) {
if (p.indexOf(".bat") !== p.length - 4) {

17
tools/isobuild/meteor-npm.js
View File

@@ -338,17 +338,13 @@ var currentNodeCompatibilityVersion = function () {
};
var runNpmCommand = function (args, cwd) {
const nodeBinDir = files.getCurrentNodeBinDir();
var npmPath;
var nodeBinDir;
if (os.platform() === "win32") {
npmPath = files.convertToOSPath(
files.pathJoin(files.getDevBundle(), "bin", "npm.cmd"));
nodeBinDir = files.convertToOSPath(
files.pathJoin(files.getDevBundle(), "bin"));
npmPath = files.pathJoin(nodeBinDir, "npm.cmd");
} else {
npmPath = files.pathJoin(files.getDevBundle(), "bin", "npm");
nodeBinDir = files.pathJoin(files.getDevBundle(), "bin");
npmPath = files.pathJoin(nodeBinDir, "npm");
}
if (meteorNpm._printNpmCalls) // only used by test-bundler.js
@@ -358,7 +354,6 @@ var runNpmCommand = function (args, cwd) {
if (cwd)
cwd = files.convertToOSPath(cwd);
var env = process.env;
// It looks like some npm commands (such as build commands, specifically on
// Windows) rely on having a global node binary present.
// Sometimes users have a global node installed, so it is not
@@ -367,9 +362,8 @@ var runNpmCommand = function (args, cwd) {
// containing the node binary we are running in right now as the highest
// priority.
// This hack is confusing as npm is supposed to do it already.
var pathDecomposed = (env.PATH || "").split(files.pathOsDelimiter);
pathDecomposed.unshift(nodeBinDir);
env.PATH = pathDecomposed.join(files.pathOsDelimiter);
const env = files.currentEnvWithPathsAdded(nodeBinDir);
var opts = { cwd: cwd, env: env, maxBuffer: 10 * 1024 * 1024 };
var future = new Future;
@@ -648,4 +642,3 @@ var logUpdateDependencies = function (packageName, npmDependencies) {
};
exports.runNpmCommand = runNpmCommand;