Permalink
Browse files

Fixed rails checking for RVM systems

  • Loading branch information...
1 parent 5937f2d commit d8e9c951a5f70850a89bf5dc7a911580473b338a @rafaelmessias rafaelmessias committed May 24, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 config/boot.rb
View
@@ -109,7 +109,7 @@ def read_environment_rb
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

0 comments on commit d8e9c95

Please sign in to comment.