diff options
| author | Kat Marchán <kzm@sykosomatic.org> | 2017-01-26 17:21:26 +0100 |
|---|---|---|
| committer | Jeremiah Senkpiel <fishrock123@rocketmail.com> | 2017-01-30 14:47:24 -0500 |
| commit | afb7c1bac87d943a9ca6422c7100e0e3fe291740 (patch) | |
| tree | 1ce1f8214473a200de9de52989c1ec8aad8ddf89 /deps/npm/node_modules/node-gyp/bin/node-gyp.js | |
| parent | 5de3cf099cd01c84d1809dab90c041b76aa58d8e (diff) | |
| download | android-node-v8-afb7c1bac87d943a9ca6422c7100e0e3fe291740.tar.gz android-node-v8-afb7c1bac87d943a9ca6422c7100e0e3fe291740.tar.bz2 android-node-v8-afb7c1bac87d943a9ca6422c7100e0e3fe291740.zip | |
deps: upgrade npm to 4.1.2
PR-URL: https://github.com/nodejs/node/pull/11020
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Diffstat (limited to 'deps/npm/node_modules/node-gyp/bin/node-gyp.js')
| -rwxr-xr-x | deps/npm/node_modules/node-gyp/bin/node-gyp.js | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/deps/npm/node_modules/node-gyp/bin/node-gyp.js b/deps/npm/node_modules/node-gyp/bin/node-gyp.js index e44e73877c..70d7d50262 100755 --- a/deps/npm/node_modules/node-gyp/bin/node-gyp.js +++ b/deps/npm/node_modules/node-gyp/bin/node-gyp.js @@ -12,6 +12,8 @@ process.title = 'node-gyp' var gyp = require('../') var log = require('npmlog') +var osenv = require('osenv') +var path = require('path') /** * Process and execute the selected commands. @@ -20,6 +22,19 @@ var log = require('npmlog') var prog = gyp() var completed = false prog.parseArgv(process.argv) +prog.devDir = prog.opts.devdir + +var homeDir = osenv.home() +if (prog.devDir) { + prog.devDir = prog.devDir.replace(/^~/, homeDir) +} else if (homeDir) { + prog.devDir = path.resolve(homeDir, '.node-gyp') +} else { + throw new Error( + "node-gyp requires that the user's home directory is specified " + + "in either of the environmental variables HOME or USERPROFILE. " + + "Overide with: --devdir /path/to/.node-gyp") +} if (prog.todo.length === 0) { if (~process.argv.indexOf('-v') || ~process.argv.indexOf('--version')) { |