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

Don't overwrite silently on symlink conflicts

Browse Source 
Symlink conflicts are now handled in similar fashion as normal
file-conflicts.
This commit is contained in:
Jacek Sowiński
2017-03-17 19:16:40 +01:00
parent c5b24b9b38
commit 85f46e01b1
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,8 +68,10 @@ module Homesick
"#{destination} exists and points to #{destination.readlink}", "#{destination} exists and points to #{destination.readlink}",
:red :red
FileUtils.rm destination if collision_accepted?(destination, source)
FileUtils.ln_s source, destination, force: true unless options[:pretend] FileUtils.rm destination
FileUtils.ln_s source, destination, force: true unless options[:pretend]
end
when :conflict when :conflict
say_status :conflict, "#{destination} exists", :red say_status :conflict, "#{destination} exists", :red