diff options
| author | isaacs <nope@not.real> | 2019-07-03 10:23:19 -0700 |
|---|---|---|
| committer | Rich Trott <rtrott@gmail.com> | 2019-07-18 15:12:49 -0700 |
| commit | 1721034a40c5e7a0a334701dc36153adee3f27e5 (patch) | |
| tree | 7b2ce5a0c5d67d2e1d817fc548571250e8c1a305 /deps/npm/lib/unbuild.js | |
| parent | 6df7b6a4f9cb64d298e7fd0691c4d09679872922 (diff) | |
| download | android-node-v8-1721034a40c5e7a0a334701dc36153adee3f27e5.tar.gz android-node-v8-1721034a40c5e7a0a334701dc36153adee3f27e5.tar.bz2 android-node-v8-1721034a40c5e7a0a334701dc36153adee3f27e5.zip | |
deps: upgrade npm to 6.10.0
PR-URL: https://github.com/nodejs/node/pull/28525
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Roman Reiss <me@silverwind.io>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Daijiro Wachi <daijiro.wachi@gmail.com>
Diffstat (limited to 'deps/npm/lib/unbuild.js')
| -rw-r--r-- | deps/npm/lib/unbuild.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/deps/npm/lib/unbuild.js b/deps/npm/lib/unbuild.js index d527778e92..3e115b6999 100644 --- a/deps/npm/lib/unbuild.js +++ b/deps/npm/lib/unbuild.js @@ -58,7 +58,9 @@ function rmStuff (pkg, folder, cb) { // if it's global, and folder is in {prefix}/node_modules, // then bins are in {prefix}/bin // otherwise, then bins are in folder/../.bin - var parent = pkg.name[0] === '@' ? path.dirname(path.dirname(folder)) : path.dirname(folder) + var dir = path.dirname(folder) + var scope = path.basename(dir) + var parent = scope.charAt(0) === '@' ? path.dirname(dir) : dir var gnm = npm.dir // gnm might be an absolute path, parent might be relative // this checks they're the same directory regardless |