diff --git a/script/bootstrap b/script/bootstrap index e87d0b4cc..7ab3237d1 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -22,7 +22,7 @@ function executeCommands(commands, done, index) { done(null); } -var apmFlags = process.env.JANKY_SHA1 || process.env.BUILT_PRODUCTS_DIR ? '--no-color' : ''; +var apmFlags = process.env.JANKY_SHA1 || process.argv.indexOf('--no-color') !== -1 ? '--no-color' : ''; var echoNewLine = process.platform == 'win32' ? 'echo.' : 'echo'; var commands = [ 'git submodule --quiet sync', diff --git a/script/build b/script/build index bb65d7607..07ceaaf7d 100755 --- a/script/build +++ b/script/build @@ -4,7 +4,7 @@ var path = require('path'); process.chdir(path.dirname(__dirname)); -cp.safeExec('node script/bootstrap', function() { +cp.safeExec('node script/bootstrap --no-color', function() { // node_modules/.bin/grunt "$@" var gruntPath = path.join('node_modules', '.bin', 'grunt') + (process.platform === 'win32' ? '.cmd' : ''); cp.safeSpawn(gruntPath, process.argv.slice(2), process.exit);