deps: upgrade npm to 4.5.0

PR-URL: https://github.com/nodejs/node/pull/12480
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>

1 files changed, 13 insertions, 3 deletions

diff --git a/deps/npm/node_modules/rimraf/bin.js b/deps/npm/node_modules/rimraf/bin.js
index 1bd5a0d16a..0d1e17be70 100755
--- a/deps/npm/node_modules/rimraf/bin.js
+++ b/deps/npm/node_modules/rimraf/bin.js
@@ -4,16 +4,21 @@ var rimraf = require('./')
 
 var help = false
 var dashdash = false
+var noglob = false
 var args = process.argv.slice(2).filter(function(arg) {
   if (dashdash)
     return !!arg
   else if (arg === '--')
     dashdash = true
+  else if (arg === '--no-glob' || arg === '-G')
+    noglob = true
+  else if (arg === '--glob' || arg === '-g')
+    noglob = false
   else if (arg.match(/^(-+|\/)(h(elp)?|\?)$/))
     help = true
   else
     return !!arg
-});
+})
 
 if (help || args.length === 0) {
   // If they didn't ask for help, then this is not a "success"
@@ -24,7 +29,9 @@ if (help || args.length === 0) {
   log('')
   log('Options:')
   log('')
-  log('  -h, --help    Display this usage info')
+  log('  -h, --help     Display this usage info')
+  log('  -G, --no-glob  Do not expand glob patterns in arguments')
+  log('  -g, --glob     Expand glob patterns in arguments (default)')
   process.exit(help ? 0 : 1)
 } else
   go(0)
@@ -32,7 +39,10 @@ if (help || args.length === 0) {
 function go (n) {
   if (n >= args.length)
     return
-  rimraf(args[n], function (er) {
+  var options = {}
+  if (noglob)
+    options = { glob: false }
+  rimraf(args[n], options, function (er) {
     if (er)
       throw er
     go(n+1)