make homesick symlink respect the force option

Signed-off-by: Joshua Nichols <josh@technicalpickles.com>
This commit is contained in:
Mathieu Sauve-Frankel
2010-06-21 21:48:44 -07:00
committed by Joshua Nichols
parent 04e7df1283
commit 1041cb5160

View File

@@ -69,14 +69,14 @@ class Homesick
else else
say_status :conflict, "#{destination} exists and points to #{destination.readlink}", :red unless options[:quiet] say_status :conflict, "#{destination} exists and points to #{destination.readlink}", :red unless options[:quiet]
if shell.file_collision(destination) { source } if options[:force] or shell.file_collision(destination) { source }
system "ln -sf #{source} #{destination}" unless options[:pretend] system "ln -sf #{source} #{destination}" unless options[:pretend]
end end
end end
elsif destination.exist? elsif destination.exist?
say_status :conflict, "#{destination} exists", :red unless options[:quiet] say_status :conflict, "#{destination} exists", :red unless options[:quiet]
if shell.file_collision(destination) { source } if options[:force] or shell.file_collision(destination) { source }
system "ln -sf #{source} #{destination}" unless options[:pretend] system "ln -sf #{source} #{destination}" unless options[:pretend]
end end
else else