Skip to content

Commit e6f7473

Browse files
committed
Merge pull request #269 from phase2/bug/can-rsync-is-a-function
util.canRsync() is a function
2 parents 9cfd381 + 039f94d commit e6f7473

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

lib/util.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ module.exports = {
88
return baseUrl + value;
99
});
1010
},
11-
canRsync: function() {
11+
canRsync: function(options) {
1212
// Enable process.platform to be mocked in options for testing.
13-
var platform = options.platform || process.platform;
13+
var platform = options && options.platform ? options.platform : process.platform;
1414
return platform !== "win32";
1515
}
1616
};

tasks/composer.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,15 @@ module.exports = function(grunt) {
1111
grunt.loadNpmTasks('grunt-composer');
1212
var Help = require('../lib/help')(grunt);
1313

14-
grunt.config(['composer', 'install'], {});
14+
grunt.config(['composer', 'install'], {
15+
options: {
16+
flags: [
17+
'no-interaction',
18+
'no-progress',
19+
'prefer-dist'
20+
],
21+
}
22+
});
1523

1624
Help.add({
1725
task: 'composer',

tasks/make.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ module.exports = function(grunt) {
5757
'clean:temp',
5858
'drush:make',
5959
'clean:default',
60-
gdt.canRsync ? 'rsync:tempbuild' : 'copy:tempbuild',
60+
gdt.canRsync() ? 'rsync:tempbuild' : 'copy:tempbuild',
6161
'clean:temp'
6262
]
6363
}

0 commit comments

Comments
 (0)