diff --git a/bin.js b/bin.js index 3fbcdf0..7ca3ab5 100755 --- a/bin.js +++ b/bin.js @@ -16,7 +16,8 @@ if (!buildFromSource()) { } function build () { - var args = [os.platform() === 'win32' ? 'node-gyp.cmd' : 'node-gyp', 'rebuild'] + var win32 = os.platform() === 'win32' + var args = [win32 ? 'node-gyp.cmd' : 'node-gyp', 'rebuild'] try { var pkg = require('node-gyp/package.json') @@ -27,7 +28,7 @@ function build () { ] } catch (_) {} - proc.spawn(args[0], args.slice(1), { stdio: 'inherit' }).on('exit', function (code) { + proc.spawn(args[0], args.slice(1), { stdio: 'inherit', shell: win32, windowsHide: true }).on('exit', function (code) { if (code || !process.argv[3]) process.exit(code) exec(process.argv[3]).on('exit', function (code) { process.exit(code) @@ -45,15 +46,18 @@ function preinstall () { function exec (cmd) { if (process.platform !== 'win32') { - var shell = os.platform() === 'android' ? 'sh' : '/bin/sh' - return proc.spawn(shell, ['-c', '--', cmd], { + var shell = os.platform() === 'android' ? 'sh' : true + return proc.spawn(cmd, [], { + shell, stdio: 'inherit' }) } - return proc.spawn(process.env.comspec || 'cmd.exe', ['/s', '/c', '"' + cmd + '"'], { + return proc.spawn(cmd, [], { windowsVerbatimArguments: true, - stdio: 'inherit' + stdio: 'inherit', + shell: true, + windowsHide: true }) }