aether/gosick
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #149 from mail6543210/master

Browse Source 
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
parent 2f5e20d963 ed397bdaf8
commit f0e11abb5b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/homesick/utils.rb
View File

@@ -150,7 +150,7 @@ module Homesick
def collision_accepted?(destination, source) 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) 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 end
def each_file(castle, basedir, subdirs) def each_file(castle, basedir, subdirs)