From 865b98f1c077ef23a83c59b31ac66178526eb688 Mon Sep 17 00:00:00 2001 From: Tom Vaughan Date: Sun, 23 Feb 2014 11:26:27 -0300 Subject: [PATCH] Ensure `-e ssh ...` is always passed to rsync. Fixes #54 --- README.md | 2 +- lib/middleman-deploy/methods/rsync.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index b17804c..5d4c794 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ activate :deploy do |deploy| # deploy.user = "tvaughan" # no default # deploy.port = 5309 # ssh port, default: 22 # deploy.clean = true # remove orphaned files on remote host, default: false - # deploy.flags = "-rltgoDvzO --no-p --del -e" # add custom flags, default: -avze + # deploy.flags = "-rltgoDvzO --no-p --del" # add custom flags, default: -avz end ``` diff --git a/lib/middleman-deploy/methods/rsync.rb b/lib/middleman-deploy/methods/rsync.rb index e4e1494..c65454a 100644 --- a/lib/middleman-deploy/methods/rsync.rb +++ b/lib/middleman-deploy/methods/rsync.rb @@ -21,8 +21,8 @@ module Middleman user = "#{self.user}@" if self.user && !self.user.empty? dest_url = "#{user}#{self.host}:#{self.path}" - flags = self.flags || '-avze' - command = "rsync #{flags} 'ssh -p #{self.port}' #{self.server_instance.build_dir}/ #{dest_url}" + flags = self.flags || '-avz' + command = "rsync #{flags} '-e ssh -p #{self.port}' #{self.server_instance.build_dir}/ #{dest_url}" if self.clean command += " --delete"