Commit c9f9a9e50ef466f8d1b06a03f1539d22baf72ca8 to FooBarWidget's passenger

FooBarWidget / passenger

Description:	Phusion Passenger (mod_rails)
Homepage:	http://www.modrails.com/
Clone URL:	git://github.com/FooBarWidget/passenger.git Give this clone URL to anyone. `git clone git://github.com/FooBarWidget/passenger.git`

Click here to lend your support to: passenger and make a donation at www.pledgie.com !

Detect the Rake installation that belongs to the Ruby interpreter that was 
used to run the installer, instead of the Rake that's in PATH. Update the 
gem installation instructions so that the RubyGems command that belongs to 
the Ruby interpreter that was used to run the installer is preferred.

Hongli Lai (Phusion) (author)

Thu Dec 04 09:55:03 -0800 2008

commit c9f9a9e50ef466f8d1b06a03f1539d22baf72ca8
tree 273dc68b8781386396014b4f2bf75ad2316970e3
parent 2aa5bed5c9872b2a8f2efecb6e5e9d131e411bb2

lib/passenger/dependencies.rb

lib/passenger/dependencies.rb

0
@@ -185,15 +185,21 @@ module Dependencies # :nodoc: all
0
   Rake = Dependency.new do |dep|
0
     dep.name = "Rake"
0
     dep.define_checker do |result|
0
-			rake = PlatformInfo.find_command("rake")
0
-			if rake.nil?
0
-				result.not_found
0
-			else
0
+			bindir = File.dirname(PlatformInfo::RUBY)
0
+			rake = File.join(bindir, "rake")
0
+			if File.executable?(rake)
0
         result.found(rake)
0
+			else
0
+				rake = PlatformInfo.find_command("rake")
0
+				if rake.nil?
0
+					result.not_found
0
+				else
0
+					result.found(rake)
0
+				end
0
       end
0
     end
0
     dep.website = "http://rake.rubyforge.org/"
0
-		dep.install_instructions = "Please install RubyGems first, then run <b>gem install rake</b>"
0
+		dep.install_instructions = "Please install RubyGems first, then run <b>#{PlatformInfo::GEM} install rake</b>"
0
   end
0
   
0
   Apache2 = Dependency.new do |dep|
0
@@ -302,7 +308,7 @@ module Dependencies # :nodoc: all
0
         result.not_found
0
       end
0
     end
0
-		dep.install_instructions = "Please install RubyGems first, then run <b>gem install fastthread</b>"
0
+		dep.install_instructions = "Please install RubyGems first, then run <b>#{PlatformInfo::GEM} install fastthread</b>"
0
   end
0
 
0
   Rack = Dependency.new do |dep|
0
@@ -319,7 +325,7 @@ module Dependencies # :nodoc: all
0
         result.not_found
0
       end
0
     end
0
-		dep.install_instructions = "Please install RubyGems first, then run <b>gem install rack</b>"
0
+		dep.install_instructions = "Please install RubyGems first, then run <b>#{PlatformInfo::GEM} install rack</b>"
0
   end
0
 end
0

Comments

No one has commented yet.