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

Merge pull request #159 from mruwek/refactor-conflict-actions

Browse Source 
Wrap symlink and regular conflicts into one case
This commit is contained in:
Jeremy Cook
2017-03-20 16:07:19 -04:00
committed by GitHub
parent 693ae5f05e 6590a1eeff
commit 3b8a5b4be4
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,18 +63,14 @@ module Homesick
case action
when :identical
say_status :identical, destination.expand_path, :blue
when :symlink_conflict
when :symlink_conflict, :conflict
if action == :conflict
say_status :conflict, "#{destination} exists", :red
else
say_status :conflict,
"#{destination} exists and points to #{destination.readlink}",
:red
if collision_accepted?(destination, source)
FileUtils.rm destination
FileUtils.ln_s source, destination, force: true unless options[:pretend]
end
when :conflict
say_status :conflict, "#{destination} exists", :red
if collision_accepted?(destination, source)
FileUtils.rm_r destination, force: true unless options[:pretend]
FileUtils.ln_s source, destination, force: true unless options[:pretend]