Roll back af93028 in lib/utils/prompt.js

This introduced a bug which breaks init and adduser.

1 files changed, 7 insertions, 10 deletions

diff --git a/lib/utils/prompt.js b/lib/utils/prompt.js
index 5bfc16adf..5035caece 100644
--- a/lib/utils/prompt.js
+++ b/lib/utils/prompt.js
@@ -3,19 +3,16 @@ module.exports = prompt
 
 var log = require("./log")
   , buffer = ""
-  , output = require("./output")
   , stdio = process.binding("stdio")
-  , npm = require("../../npm")
 
 function prompt (p, def, silent, cb) {
-  var outfd = npm.config.get("outfd")
   if (!cb) cb = silent, silent = false
   if (!cb) cb = def, def = undefined
   if (def) p += "("+(silent ? "<hidden>" : def)+") "
-  output.write(outfd, p, function () {
-    if (silent) silentRead(def, cb)
-    else read(def, cb)
-  })
+  process.stdout.write(p)
+  process.stdout.flush()
+
+  return (silent) ? silentRead(def, cb) : read(def, cb)
 }
 
 function read (def, cb) {
@@ -52,10 +49,10 @@ function silentRead (def, cb) {
         stdio.setRawMode(false)
         stdin.removeListener("data", D)
         val = val.trim() || def
+        process.stdout.write("\n")
+        process.stdout.flush()
         stdin.pause()
-        output.write(npm.config.get("outfd"), "\n", function () {
-          cb(null, val)
-        })
+        return cb(null, val)
       case "\u0003": case "\0":
         return cb("cancelled")
         break