From d8e9c951a5f70850a89bf5dc7a911580473b338a Mon Sep 17 00:00:00 2001 From: Rafael Martins Date: Thu, 24 May 2012 19:36:53 -0300 Subject: [PATCH] Fixed rails checking for RVM systems --- config/boot.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/boot.rb b/config/boot.rb index aead587..d105634 100644 --- a/config/boot.rb +++ b/config/boot.rb @@ -109,7 +109,7 @@ end def install_debian_rails local_rails = File.dirname(__FILE__) + '/../vendor/rails' debian_rails = ['/usr/share/rails-ruby1.8', '/usr/lib/ruby/vendor_ruby/rails'].find { |d| File.exists?(d) } - if !File.exist?(local_rails) && File.exists?(debian_rails) + if !File.exist?(local_rails) && debian_rails && File.exists?(debian_rails) File.delete(local_rails) if File.symlink?(local_rails) # remove dangling symlink puts "I: Installing Debian-installed Rails from /usr/share/rails into vendor/rails." recommended_rails_version = Rails::GemBoot.gem_version -- libgit2 0.21.2