Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:FooBarWidget/passenger

  • Loading branch information...
commit 4914f935ee4c58e1046f6dbb49e7c6f265866a7a 2 parents c213853 + 8c9e147
@FooBarWidget FooBarWidget authored
Showing with 3 additions and 2 deletions.
  1. +3 −2 lib/phusion_passenger/platform_info/ruby.rb
View
5 lib/phusion_passenger/platform_info/ruby.rb
@@ -164,14 +164,15 @@ def self.rvm_path
[ENV['rvm_path'], "~/.rvm", "/usr/local/rvm"].each do |path|
next if path.nil?
path = File.expand_path(path)
- return path if File.directory?(path)
+ script_path = File.join(path, 'scripts', 'rvm')
+ return path if File.directory?(path) && File.exist?(script_path)
end
# Failure to locate the RVM path is probably caused by the
# user customizing $rvm_path. Older RVM versions don't
# export $rvm_path, making us unable to detect its value.
STDERR.puts "Unable to locate the RVM path. Your RVM installation " +
"is probably too old. Please update it with " +
- "'rvm update --head && rvm reload && rvm repair all'."
+ "'rvm get head && rvm reload && rvm repair all'."
exit 1
else
return nil
Please sign in to comment.
Something went wrong with that request. Please try again.