From 56f45e0c7dc89050a7a949c735140630e70debc5 Mon Sep 17 00:00:00 2001 From: Doug Bunting Date: Tue, 27 Jan 2015 09:05:21 -0800 Subject: [PATCH] Include `bower` and `npm` commands in `--quiet` target --- build/_bower.shade | 2 +- build/_grunt.shade | 2 +- build/_k-standard-goals.shade | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/build/_bower.shade b/build/_bower.shade index f4e6562735..515cea44b9 100644 --- a/build/_bower.shade +++ b/build/_bower.shade @@ -6,7 +6,7 @@ var bowerInstalled = '${Directory.Exists(Path.Combine(nodeDir, "node_modules", " var bowerCmd = '${ bowerGloballyInstalled ? "bower" : Path.Combine(nodeDir, "node_modules", "bower", "bin", "bower") }' - // Install bower locally if not already installed either globally or locally -npm npmCommand='install --prefix ${nodeDir} bower' if='!(bowerGloballyInstalled || bowerInstalled)' once='installBower' +npm npmCommand='install ${E("npm_install_options")} --prefix ${nodeDir} bower' if='!(bowerGloballyInstalled || bowerInstalled)' once='installBower' - // Run bower exec program='cmd' commandline='/C ${bowerCmd} ${bowerCommand}' workingdir='${bowerDir}' if='bowerGloballyInstalled && !IsLinux' diff --git a/build/_grunt.shade b/build/_grunt.shade index a760008be5..c2e9f8b257 100644 --- a/build/_grunt.shade +++ b/build/_grunt.shade @@ -6,7 +6,7 @@ var gruntCliInstalled = '${Directory.Exists(Path.Combine(nodeDir, "node_modules" var gruntCmd = '${ gruntCliGloballyInstalled ? "grunt" : Path.Combine(nodeDir, "node_modules", "grunt-cli") }' -// Install grunt-cli locally -npm npmCommand='install --prefix ${nodeDir} grunt-cli' if='!(gruntCliGloballyInstalled || gruntCliInstalled)' once='installGruntCli' +npm npmCommand='install ${E("npm_install_options")} --prefix ${nodeDir} grunt-cli' if='!(gruntCliGloballyInstalled || gruntCliInstalled)' once='installGruntCli' -// Run grunt exec program='cmd' commandline='/C ${gruntCmd}' workingdir='${gruntDir}' if='gruntCliGloballyInstalled' diff --git a/build/_k-standard-goals.shade b/build/_k-standard-goals.shade index b04bbe3353..870abea441 100644 --- a/build/_k-standard-goals.shade +++ b/build/_k-standard-goals.shade @@ -95,12 +95,12 @@ default Configuration='${E("Configuration")}' #restore-npm-modules -// Find all dirs that contain a package.json file var npmDirs = '${GetDirectoriesContaining(Directory.GetCurrentDirectory(), "package.json")}' - npm npmCommand='install' each='var npmDir in npmDirs' + npm npmCommand='install ${E("npm_install_options")}' each='var npmDir in npmDirs' #restore-bower-components -// Find all dirs that contain a bower.json file var bowerDirs = '${GetDirectoriesContaining(Directory.GetCurrentDirectory(), "bower.json")}' - bower each='var bowerDir in bowerDirs' bowerCommand='install' + bower each='var bowerDir in bowerDirs' bowerCommand='install ${E("bower_install_options")}' #run-grunt .restore-npm-modules .restore-bower-components target='compile' -// Find all dirs that contain a gruntfile.js file @@ -122,6 +122,8 @@ default Configuration='${E("Configuration")}' @{ E("KPM_pack_options"," --quiet"); E("KPM_restore_options"," --quiet"); + E("bower_install_options","--quiet"); + E("npm_install_options","--quiet"); } #stylecop if='Directory.Exists("src")'