From 7fc0f26efb219b7ca4094eddfbaa053bbc064da6 Mon Sep 17 00:00:00 2001
From: bridiver <github@brianjohnson.cc>
Date: Wed, 9 Nov 2016 17:00:59 -0700
Subject: [PATCH] cleanup

---
 build/commands/scripts/util.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/build/commands/scripts/util.js b/build/commands/scripts/util.js
index 8f58244374e..3e3ca715c99 100644
--- a/build/commands/scripts/util.js
+++ b/build/commands/scripts/util.js
@@ -15,19 +15,18 @@ const muonDir = path.join(srcDir, 'electron')
 const patchesDir = path.join(srcDir, 'libchromiumcontent')
 const resourcesDir = path.join(rootDir, 'resources')
 
-const defaultOptions = {
-  env: process.env,
-  shell: true,
-  stdio: 'inherit',
-  cwd: srcDir
-}
-
 let shell_path = process.env.PATH.split(path.delimiter)
 shell_path.push(depotToolsDir)
 shell_path.push(buildToolsDir)
 shell_path = shell_path.join(path.delimiter)
 process.env.PATH = shell_path
 
+const defaultOptions = {
+  env: process.env,
+  stdio: 'inherit',
+  cwd: srcDir
+}
+
 const util = {
   defaultChromeRef,
   defaultMuonRef,
@@ -42,10 +41,11 @@ const util = {
   resourcesDir,
   defaultOptions,
 
-  run: (cmd, args, options = defaultOptions) => {
-    console.log(cmd, args)
+  run: (cmd, args = [], options = defaultOptions) => {
+    console.log(cmd, args.join(' '))
     const prog = spawnSync(cmd, args, options)
     if (prog.status !== 0) {
+      console.log(prog.output.join('\n'))
       console.error(prog.error)
       process.exit(1)
     }