diff options
| author | Anil Wadghule <anildigital@gmail.com> | 2010-04-26 20:55:07 +0530 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2010-04-26 11:12:52 -0700 |
| commit | 53c13f1acaa2eb05e7f418b53f6156a4f5a773e0 (patch) | |
| tree | e6a0a66b7f4af519f03a190db5443b2e6d11fcce /railties/lib/rails/generators/actions.rb | |
| parent | e813ad2a42549e308a69fd9473f1b9ed531a0d7e (diff) | |
| download | rails-53c13f1acaa2eb05e7f418b53f6156a4f5a773e0.tar.gz rails-53c13f1acaa2eb05e7f418b53f6156a4f5a773e0.tar.bz2 rails-53c13f1acaa2eb05e7f418b53f6156a4f5a773e0.zip | |
Use Config::CONFIG['host_os'] instead of RUBY_PLATFORM [#4477 state:resolved]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Diffstat (limited to 'railties/lib/rails/generators/actions.rb')
| -rw-r--r-- | railties/lib/rails/generators/actions.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/actions.rb b/railties/lib/rails/generators/actions.rb index 7dec4d446a..a31932906d 100644 --- a/railties/lib/rails/generators/actions.rb +++ b/railties/lib/rails/generators/actions.rb @@ -1,5 +1,6 @@ require 'open-uri' require 'active_support/deprecation' +require 'rbconfig' module Rails module Generators @@ -240,7 +241,7 @@ module Rails def rake(command, options={}) log :rake, command env = options[:env] || 'development' - sudo = options[:sudo] && RUBY_PLATFORM !~ /mswin|mingw/ ? 'sudo ' : '' + sudo = options[:sudo] && Config::CONFIG['host_os'] !~ /mswin|mingw/ ? 'sudo ' : '' in_root { run("#{sudo}#{extify(:rake)} #{command} RAILS_ENV=#{env}", :verbose => false) } end @@ -307,7 +308,7 @@ module Rails # Add an extension to the given name based on the platform. # def extify(name) - if RUBY_PLATFORM =~ /mswin|mingw/ + if Config::CONFIG['host_os'] =~ /mswin|mingw/ "#{name}.bat" else name |