From 5c55e6655146b5d5ec55c2e41d240985b338a354 Mon Sep 17 00:00:00 2001 From: Rita Marcinkiewicz Date: Sun, 4 Feb 2018 16:32:43 +0300 Subject: [PATCH 1/2] Fix local to remote dears path .1 Firstly `./` on my local env ( Sierra 10.13.2 and Ruby 2.5.0 ) produce this error: ``` rsync: link_stat "/Users/margo/project/./public/storage" failed: No such file or directory (2) ``` .2 Then, I think we should copy files from `local_dirs` to `dirs`, and not vice versa. P.S. thanks for this awesome useful gem! :) --- lib/capistrano-db-tasks/asset.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/capistrano-db-tasks/asset.rb b/lib/capistrano-db-tasks/asset.rb index 5b7e93c..b6943a3 100644 --- a/lib/capistrano-db-tasks/asset.rb +++ b/lib/capistrano-db-tasks/asset.rb @@ -23,7 +23,7 @@ def local_to_remote(cap) local_dirs = [cap.fetch(:local_assets_dir)].flatten dirs.each_index do |idx| - system("rsync -a --del -L -K -vv --progress --rsh='ssh -p #{port}' ./#{dirs[idx]} #{user}@#{server}:#{cap.current_path}/#{local_dirs[idx]}") + system("rsync -a --del -L -K -vv --progress --rsh='ssh -p #{port}' #{local_dirs[idx]} #{user}@#{server}:#{cap.current_path}/#{dirs[idx]}") end end From 431a819f570047f078f85490165e547a68375533 Mon Sep 17 00:00:00 2001 From: ritaritual Date: Mon, 5 Feb 2018 05:16:24 +0300 Subject: [PATCH 2/2] Add trailing slash to move push only contents of directory --- lib/capistrano-db-tasks/asset.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/capistrano-db-tasks/asset.rb b/lib/capistrano-db-tasks/asset.rb index b6943a3..8a8d640 100644 --- a/lib/capistrano-db-tasks/asset.rb +++ b/lib/capistrano-db-tasks/asset.rb @@ -23,7 +23,7 @@ def local_to_remote(cap) local_dirs = [cap.fetch(:local_assets_dir)].flatten dirs.each_index do |idx| - system("rsync -a --del -L -K -vv --progress --rsh='ssh -p #{port}' #{local_dirs[idx]} #{user}@#{server}:#{cap.current_path}/#{dirs[idx]}") + system("rsync -a --del -L -K -vv --progress --rsh='ssh -p #{port}' #{local_dirs[idx]}/ #{user}@#{server}:#{cap.current_path}/#{dirs[idx]}") end end