Fixing a bug that breaks the handling of collisions.

2014-04-22 20:54:05 -04:00
parent b5138bcdd1
commit f55828f1d4
2 changed files with 3 additions and 2 deletions
--- a/lib/homesick/actions/file_actions.rb
+++ b/lib/homesick/actions/file_actions.rb
@@ -75,7 +75,7 @@ module Homesick
        when :conflict
          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.ln_s source, destination, force: true unless options[:pretend]
          end