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

Use || instead of or

Browse Source
This commit is contained in:
Joshua Nichols
2010-09-03 18:49:49 -04:00
parent 1041cb5160
commit 3f26a74c71
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/homesick/actions.rb
View File

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