Merge pull request #149 from mail6543210/master

Use source content instead of source path (fixes: #148). Thanks for fixing this!
This commit is contained in:
Jeremy Cook
2016-01-21 20:05:33 -05:00

View File

@@ -150,7 +150,7 @@ module Homesick
def collision_accepted?(destination, source)
fail "Arguments must be instances of Pathname, #{destination.class.name} and #{source.class.name} given" unless destination.instance_of?(Pathname) && source.instance_of?(Pathname)
options[:force] || shell.file_collision(destination) { source }
options[:force] || shell.file_collision(destination) { File.binread(source) }
end
def each_file(castle, basedir, subdirs)