npm: Update to 1.4.28

3 files changed, 15 insertions, 11 deletions

diff --git a/deps/npm/scripts/doc-build.sh b/deps/npm/scripts/doc-build.sh
index 18f4e6ca86..9afab0782b 100755
--- a/deps/npm/scripts/doc-build.sh
+++ b/deps/npm/scripts/doc-build.sh
@@ -70,9 +70,9 @@ case $dest in
   *.[1357])
     ./node_modules/.bin/ronn --roff $src \
     | sed "s|@VERSION@|$version|g" \
-    | perl -pi -e 's/(npm\\-)?([^\(]*)\(1\)/npm help \2/g' \
-    | perl -pi -e 's/(npm\\-)?([^\(]*)\([57]\)/npm help \3 \2/g' \
-    | perl -pi -e 's/(npm\\-)?([^\(]*)\(3\)/npm apihelp \2/g' \
+    | perl -pi -e 's/(npm\\-)?([a-zA-Z\\\.\-]*)\(1\)/npm help \2/g' \
+    | perl -pi -e 's/(npm\\-)?([a-zA-Z\\\.\-]*)\(([57])\)/npm help \3 \2/g' \
+    | perl -pi -e 's/(npm\\-)?([a-zA-Z\\\.\-]*)\(3\)/npm apihelp \2/g' \
     | perl -pi -e 's/npm\(1\)/npm help npm/g' \
     | perl -pi -e 's/npm\(3\)/npm apihelp npm/g' \
     > $dest
diff --git a/deps/npm/scripts/index-build.js b/deps/npm/scripts/index-build.js
index 8031fe7277..21297cc93e 100755
--- a/deps/npm/scripts/index-build.js
+++ b/deps/npm/scripts/index-build.js
@@ -35,15 +35,16 @@ function output (files) {
     "==============================================\n")
 
   writeLines(files, 0)
-  writeLines(files, 1, "Command Line Documentation")
-  writeLines(files, 3, "API Documentation")
-  writeLines(files, 5, "Files")
-  writeLines(files, 7, "Misc")
+  writeLines(files, 1, "Command Line Documentation", "Using npm on the command line")
+  writeLines(files, 3, "API Documentation", "Using npm in your Node programs")
+  writeLines(files, 5, "Files", "File system structures npm uses")
+  writeLines(files, 7, "Misc", "Various other bits and bobs")
 }
 
-function writeLines (files, sxn, heading) {
-  if (heading)
-    console.log("# %s\n", heading)
+function writeLines (files, sxn, heading, desc) {
+  if (heading) {
+    console.log("## %s\n\n%s\n", heading, desc)
+  }
   files.filter(function (f) {
     return f[0] === sxn
   }).forEach(writeLine)
@@ -57,6 +58,6 @@ function writeLine (sd) {
 
   var content = fs.readFileSync(doc, "utf8").split("\n")[0].split("-- ")[1]
 
-  console.log("## %s(%d)\n", d, sxn)
+  console.log("### %s(%d)\n", d, sxn)
   console.log(content + "\n")
 }
diff --git a/deps/npm/scripts/publish-tag.js b/deps/npm/scripts/publish-tag.js
new file mode 100644
index 0000000000..046ec98881
--- /dev/null
+++ b/deps/npm/scripts/publish-tag.js
@@ -0,0 +1,3 @@
+var semver = require("semver")
+var version = semver.parse(require("../package.json").version)
+console.log('v%s.%s-next', version.major, version.minor)