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

Fixing a bug that breaks the handling of collisions.

Browse Source
This commit is contained in:
Jeremy Cook
2014-04-22 20:54:05 -04:00
parent b5138bcdd1
commit f55828f1d4
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/homesick/actions/file_actions.rb
View File

@@ -75,7 +75,7 @@ module Homesick
when :conflict when :conflict
say_status :conflict, "#{destination} exists", :red unless options[:quiet] say_status :conflict, "#{destination} exists", :red unless options[:quiet]
if collision_accepted? if collision_accepted?(destination)
FileUtils.rm_r destination, force: true unless options[:pretend] FileUtils.rm_r destination, force: true unless options[:pretend]
FileUtils.ln_s source, destination, force: true unless options[:pretend] FileUtils.ln_s source, destination, force: true unless options[:pretend]
end end

3
lib/homesick/utils.rb
View File

@@ -132,7 +132,8 @@ module Homesick
first_p.mtime > second_p.mtime && !first_p.symlink? first_p.mtime > second_p.mtime && !first_p.symlink?
end end
def collision_accepted? def collision_accepted?(destination)
fail "Argument must be an instance of Pathname, #{destination.class.name} given" unless destination.instance_of?(Pathname)
options[:force] || shell.file_collision(destination) { source } options[:force] || shell.file_collision(destination) { source }
end end