From 3f26a74c71855d7479f28485ef6eac6e696ddcb6 Mon Sep 17 00:00:00 2001 From: Joshua Nichols Date: Fri, 3 Sep 2010 18:49:49 -0400 Subject: [PATCH] Use || instead of or --- lib/homesick/actions.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/homesick/actions.rb b/lib/homesick/actions.rb index 3b7702a..c94f6be 100644 --- a/lib/homesick/actions.rb +++ b/lib/homesick/actions.rb @@ -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