From 28b33074cf7355b3de2f84cdf9c1d064566402e7 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 7 Sep 2016 14:45:56 -0700 Subject: [PATCH] Setup stdin in both processes on Windows --- lib/browser/init.js | 8 -------- lib/common/init.js | 24 +++++++++++++++++------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/lib/browser/init.js b/lib/browser/init.js index f7619fd17ba8..6ff328830e59 100644 --- a/lib/browser/init.js +++ b/lib/browser/init.js @@ -39,14 +39,6 @@ if (process.platform === 'win32') { } console.log = console.error = console.warn = consoleLog process.stdout.write = process.stderr.write = streamWrite - - // Always returns EOF for stdin stream. - var Readable = require('stream').Readable - var stdin = new Readable() - stdin.push(null) - process.__defineGetter__('stdin', function () { - return stdin - }) } // Don't quit on fatal error. diff --git a/lib/common/init.js b/lib/common/init.js index 257249f0a639..0ffd97a7c539 100644 --- a/lib/common/init.js +++ b/lib/common/init.js @@ -38,11 +38,21 @@ if (process.type === 'browser') { global.setInterval = wrapWithActivateUvLoop(timers.setInterval) } -// If we're running as a Windows Store app, __dirname will be set -// to C:/Program Files/WindowsApps. -// -// Nobody else get's to install there, changing the path is forbidden -// We can therefore say that we're running as appx -if (process.platform === 'win32' && __dirname.indexOf('\\Program Files\\WindowsApps\\') === 2) { - process.windowsStore = true +if (process.platform === 'win32') { + // Always returns EOF for stdin stream. + const {Readable} = require('stream') + const stdin = new Readable() + stdin.push(null) + process.__defineGetter__('stdin', function () { + return stdin + }) + + // If we're running as a Windows Store app, __dirname will be set + // to C:/Program Files/WindowsApps. + // + // Nobody else get's to install there, changing the path is forbidden + // We can therefore say that we're running as appx + if (__dirname.indexOf('\\Program Files\\WindowsApps\\') === 2) { + process.windowsStore = true + } }