From ae379f0096220dfa62c659b3d96ae495f9a737a7 Mon Sep 17 00:00:00 2001 From: Jonah Dahlquist Date: Tue, 16 Sep 2014 14:02:45 -0700 Subject: [PATCH 1/5] Added ability to accept multiple additionalOptions --- tasks/rsync.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tasks/rsync.js b/tasks/rsync.js index 7a18b02..ddaec46 100755 --- a/tasks/rsync.js +++ b/tasks/rsync.js @@ -113,7 +113,11 @@ module.exports = function (grunt) { } if (options.additionalOptions) { - args.push(options.additionalOptions); + if (Array.isArray(options.additionalOptions)) { + args.concat(options.additionalOptions); + } else { + args.push(options.additionalOptions); + } } // from this line on, the order of the args is relevant! From eab415132ee1d67752a9b6d74369ee17adbd125f Mon Sep 17 00:00:00 2001 From: Jonah Dahlquist Date: Tue, 16 Sep 2014 17:47:11 -0700 Subject: [PATCH 2/5] Fixed variable assignment --- tasks/rsync.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/rsync.js b/tasks/rsync.js index ddaec46..14c02a9 100755 --- a/tasks/rsync.js +++ b/tasks/rsync.js @@ -114,7 +114,7 @@ module.exports = function (grunt) { if (options.additionalOptions) { if (Array.isArray(options.additionalOptions)) { - args.concat(options.additionalOptions); + args = args.concat(options.additionalOptions); } else { args.push(options.additionalOptions); } From ac2cd0f8c3460c8ab2ba2be80667cf58bf51b698 Mon Sep 17 00:00:00 2001 From: Jonah Dahlquist Date: Tue, 16 Sep 2014 17:54:32 -0700 Subject: [PATCH 3/5] Corrected permissions argument --- tasks/rsync.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/rsync.js b/tasks/rsync.js index 14c02a9..f558a0b 100755 --- a/tasks/rsync.js +++ b/tasks/rsync.js @@ -72,7 +72,7 @@ module.exports = function (grunt) { options.remoteBase = options.remoteBase || '~', options.verbose = grunt.option('verbose'), options.preserveTimes = options.preserveTimes || false, - options.preservePermissions = options.preservePermissions || true, + options.preservePermissions = options.preservePermissions === undefined ? true : options.preservePermissions, options.compression = options.compression || true, options.recursive = options.recursive || true, options.clean = options.clean || false, From adc2024d46b7322316b358008047433d68a40514 Mon Sep 17 00:00:00 2001 From: Jonah Dahlquist Date: Tue, 16 Sep 2014 18:00:37 -0700 Subject: [PATCH 4/5] Fixed true default options --- tasks/rsync.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tasks/rsync.js b/tasks/rsync.js index f558a0b..e4eee29 100755 --- a/tasks/rsync.js +++ b/tasks/rsync.js @@ -72,9 +72,9 @@ module.exports = function (grunt) { options.remoteBase = options.remoteBase || '~', options.verbose = grunt.option('verbose'), options.preserveTimes = options.preserveTimes || false, - options.preservePermissions = options.preservePermissions === undefined ? true : options.preservePermissions, - options.compression = options.compression || true, - options.recursive = options.recursive || true, + options.preservePermissions = !(!options.preservePermissions || false), + options.compression = !(!options.compression || false), + options.recursive = !(!options.recursive || false), options.clean = options.clean || false, options.deleteAfter = options.deleteAfter || false; From 9c81be183c48df72e6c6b7f8b82f713cc431866a Mon Sep 17 00:00:00 2001 From: Jonah Dahlquist Date: Mon, 13 Oct 2014 16:58:00 -0700 Subject: [PATCH 5/5] Changed all true-default options to use ternary operators --- tasks/rsync.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tasks/rsync.js b/tasks/rsync.js index e4eee29..da07556 100755 --- a/tasks/rsync.js +++ b/tasks/rsync.js @@ -72,9 +72,9 @@ module.exports = function (grunt) { options.remoteBase = options.remoteBase || '~', options.verbose = grunt.option('verbose'), options.preserveTimes = options.preserveTimes || false, - options.preservePermissions = !(!options.preservePermissions || false), - options.compression = !(!options.compression || false), - options.recursive = !(!options.recursive || false), + options.preservePermissions = options.preservePermissions === undefined ? true : options.preservePermissions, + options.compression = options.compression === undefined ? true : options.compression, + options.recursive = options.recursive == undefined ? true : options.recursive, options.clean = options.clean || false, options.deleteAfter = options.deleteAfter || false;