Make `npm uninstall -g` uninstall the current package

1 files changed, 15 insertions, 4 deletions

diff --git a/lib/uninstall.js b/lib/uninstall.js
index 1ec37eab8..33de8da64 100644
--- a/lib/uninstall.js
+++ b/lib/uninstall.js
@@ -11,6 +11,7 @@ var util = require('util')
 var path = require('path')
 var validate = require('aproba')
 var chain = require('slide').chain
+var readJson = require('read-package-json')
 var npm = require('./npm.js')
 var Installer = require('./install.js').Installer
 var getSaveType = require('./install/save.js').getSaveType
@@ -23,16 +24,26 @@ uninstall.completion = require('./utils/completion/installed-shallow.js')
 function uninstall (args, cb) {
   validate('AF', arguments)
   // the /path/to/node_modules/..
-  var where = path.resolve(npm.dir, '..')
+  var where = npm.config.get('global')
+            ? path.resolve(npm.globalDir, '..')
+            : npm.prefix
   var dryrun = !!npm.config.get('dry-run')
 
+  if (args.length === 1 && args[0] === ".") args = []
   args = args.filter(function (a) {
     return path.resolve(a) !== where
   })
 
-  if (!args.length) return cb(uninstall.usage)
-
-  new Uninstaller(where, dryrun, args).run(cb)
+  if (args.length) {
+    new Uninstaller(where, dryrun, args).run(cb)
+  } else {
+    // remove this package from the global space, if it's installed there
+    readJson(path.resolve(npm.localPrefix, "package.json"), function (er, pkg) {
+      if (er && er.code !== "ENOENT" && er.code !== "ENOTDIR") return cb(er)
+      if (er) return cb(uninstall.usage)
+      new Uninstaller(where, dryrun, [pkg.name]).run(cb)
+    })
+  }
 }
 
 function Uninstaller (where, dryrun, args) {