From 4f801d8a476f7ca52b0f182bf4e17a80db12b4e2 Mon Sep 17 00:00:00 2001
From: Rebecca Turner <me@re-becca.org>
Date: Wed, 25 Jul 2018 21:15:24 -0700
Subject: [PATCH 1/2] doc: file-specifier: Remove stray comment

---
 doc/spec/file-specifiers.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/doc/spec/file-specifiers.md b/doc/spec/file-specifiers.md
index 226f6d0136728..e8d992d86db31 100644
--- a/doc/spec/file-specifiers.md
+++ b/doc/spec/file-specifiers.md
@@ -55,9 +55,6 @@ note for the `npm-shrinkwrap.json` as it means the specifier there will
 be different then the original `package.json` (where it was relative to that
 `package.json`).
 
-# No, for `file:` type specifiers, we SHOULD shrinkwrap.  Other symlinks we
-# should not. Other symlinks w/o the link spec should be an error.
-
 When shrinkwrapping file specifiers, the contents of the destination
 package's `node_modules` WILL NOT be included in the shrinkwrap. If you want to lock
 down the destination package's `node_modules` you should create a shrinkwrap for it

From d905508ada52929e812c782c94821d630d507122 Mon Sep 17 00:00:00 2001
From: Brian Olore <brian@olore.net>
Date: Fri, 27 Jul 2018 08:16:38 -0400
Subject: [PATCH 2/2] cli: don't check for updates to npm when we are updating
 npm itself

---
 bin/npm-cli.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bin/npm-cli.js b/bin/npm-cli.js
index a38009d276e3b..e4da63c9795d3 100755
--- a/bin/npm-cli.js
+++ b/bin/npm-cli.js
@@ -69,12 +69,15 @@
     npm.command = 'help'
   }
 
+  var isGlobalNpmUpdate = conf.global && ['install', 'update'].includes(npm.command) && npm.argv.includes('npm')
+
   // now actually fire up npm and run the command.
   // this is how to use npm programmatically:
   conf._exit = true
   npm.load(conf, function (er) {
     if (er) return errorHandler(er)
     if (
+      !isGlobalNpmUpdate &&
       npm.config.get('update-notifier') &&
       !unsupported.checkVersion(process.version).unsupported
     ) {