Commit 2aa5bed5c9872b2a8f2efecb6e5e9d131e411bb2 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 !

Make sure that the installer runs Rake with the same Ruby interpreter that 
was used to run the installer.

It makes installation on Ruby Enterprise Edition less error-prone.

Hongli Lai (Phusion) (author)

Thu Dec 04 07:24:12 -0800 2008

commit 2aa5bed5c9872b2a8f2efecb6e5e9d131e411bb2
tree 3e8506f30ea135aa59bb45759d937ec56f74aa05
parent 12d213e0ec446a9069e46e702b9480cdc3134357

bin/passenger-install-apache2-module
lib/passenger/platform_info.rb

bin/passenger-install-apache2-module

0
@@ -189,11 +189,12 @@ private
0
     line
0
     color_puts '<banner>Compiling and installing Apache 2 module...</banner>'
0
     puts "cd #{PASSENGER_ROOT}"
0
-		puts "rake clean apache2"
0
     if ENV['TRACE']
0
-			return system("rake", "--trace", "clean", "apache2")
0
+			puts "#{RUBY} -S rake --trace clean apache2"
0
+			return system(RUBY, "-S", "rake", "--trace", "clean", "apache2")
0
     else
0
-			return system("rake", "clean", "apache2")
0
+			puts "#{RUBY} -S rake clean apache2"
0
+			return system(RUBY, "-S", "rake", "clean", "apache2")
0
     end
0
   end
0

lib/passenger/platform_info.rb

0
@@ -289,7 +289,7 @@ public
0
   end
0
 
0
   # The absolute path to the current Ruby interpreter.
0
-	RUBY = Config::CONFIG['bindir'] + '/' + Config::CONFIG['RUBY_INSTALL_NAME']
0
+	RUBY = Config::CONFIG['bindir'] + '/' + Config::CONFIG['RUBY_INSTALL_NAME'] + Config::CONFIG['EXEEXT']
0
   # The correct 'gem' command for this Ruby interpreter.
0
   GEM = determine_gem_command
0

Comments

No one has commented yet.