diff --git a/lib/util.js b/lib/util.js index 246ad56c..0e3aa0b7 100644 --- a/lib/util.js +++ b/lib/util.js @@ -8,9 +8,9 @@ module.exports = { return baseUrl + value; }); }, - canRsync: function() { + canRsync: function(options) { // Enable process.platform to be mocked in options for testing. - var platform = options.platform || process.platform; + var platform = options && options.platform ? options.platform : process.platform; return platform !== "win32"; } }; diff --git a/tasks/composer.js b/tasks/composer.js index 27a232ee..d9b7e8ae 100644 --- a/tasks/composer.js +++ b/tasks/composer.js @@ -11,7 +11,15 @@ module.exports = function(grunt) { grunt.loadNpmTasks('grunt-composer'); var Help = require('../lib/help')(grunt); - grunt.config(['composer', 'install'], {}); + grunt.config(['composer', 'install'], { + options: { + flags: [ + 'no-interaction', + 'no-progress', + 'prefer-dist' + ], + } + }); Help.add({ task: 'composer', diff --git a/tasks/make.js b/tasks/make.js index 4f501b96..bed2ac7e 100644 --- a/tasks/make.js +++ b/tasks/make.js @@ -57,7 +57,7 @@ module.exports = function(grunt) { 'clean:temp', 'drush:make', 'clean:default', - gdt.canRsync ? 'rsync:tempbuild' : 'copy:tempbuild', + gdt.canRsync() ? 'rsync:tempbuild' : 'copy:tempbuild', 'clean:temp' ] }