1 files changed, 7 insertions, 8 deletions
diff --git a/deps/npm/lib/npm.js b/deps/npm/lib/npm.js
index 990d8c5109..3a84947f79 100644
--- a/deps/npm/lib/npm.js
+++ b/deps/npm/lib/npm.js
@@ -25,7 +25,6 @@
   var npmconf = require('./config/core.js')
   var log = require('npmlog')
 
-  var tty = require('tty')
   var path = require('path')
   var abbrev = require('abbrev')
   var which = require('which')
@@ -285,20 +284,20 @@
 
         switch (color) {
           case 'always':
-            log.enableColor()
             npm.color = true
             break
           case false:
-            log.disableColor()
             npm.color = false
             break
           default:
-            if (process.stdout.isTTY) npm.color = true
-            else if (!tty.isatty) npm.color = true
-            else if (tty.isatty(1)) npm.color = true
-            else npm.color = false
+            npm.color = process.stdout.isTTY && process.env['TERM'] !== 'dumb'
             break
         }
+        if (npm.color) {
+          log.enableColor()
+        } else {
+          log.disableColor()
+        }
 
         if (config.get('unicode')) {
           log.enableUnicode()
@@ -306,7 +305,7 @@
           log.disableUnicode()
         }
 
-        if (config.get('progress') && (process.stderr.isTTY || (tty.isatty && tty.isatty(2)))) {
+        if (config.get('progress') && process.stderr.isTTY && process.env['TERM'] !== 'dumb') {
           log.enableProgress()
         } else {
           log.disableProgress()