deps: upgrade npm to 3.3.10

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

2 files changed, 5 insertions, 18 deletions

diff --git a/deps/npm/scripts/index-build.js b/deps/npm/scripts/index-build.js
index 8fbbf8595d..058bc74019 100755
--- a/deps/npm/scripts/index-build.js
+++ b/deps/npm/scripts/index-build.js
@@ -17,11 +17,11 @@ glob(root + '/{README.md,doc/*/*.md}', function (er, files) {
   }).filter(function (f) {
     return f
   }).sort(function (a, b) {
-    return (a[0] === b[0]) ?
-              (path.basename(a[1]) === 'npm.md' ? -1 :
-               path.basename(b[1]) === 'npm.md' ? 1 :
-               a[1] > b[1] ? 1 : -1) :
-              a[0] - b[0]
+    return (a[0] === b[0])
+            ? (path.basename(a[1]) === 'npm.md' ? -1
+            : path.basename(b[1]) === 'npm.md' ? 1
+            : a[1] > b[1] ? 1 : -1)
+            : a[0] - b[0]
   }))
 })
 
diff --git a/deps/npm/scripts/installable.sh b/deps/npm/scripts/installable.sh
deleted file mode 100644
index 1d5a90c290..0000000000
--- a/deps/npm/scripts/installable.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-npmver=$(perl -E "say q{$npm_config_user_agent} =~ m{/(\S+)}")
-
-if semver -r ^3.0.0-0 $npmver > /dev/null; then
-	echo "Packaging with $npmver"
-else
-	echo "Packaging or installing npm@$npm_package_version with npm@$npmver is impossible." 1>&2
-	echo "Please install npm@^3.0.0-0 from the registry and use that or run your command with" 1>&2
-	echo "this version of npm with:" 1>&2
-	npmargs=$(node -e "a=$npm_config_argv; console.log(a.original.join(' '))")
-	echo "    $npm_node_execpath $PWD $npmargs" 1>&2
-	exit 1
-fi