aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2010-08-23 23:09:35 -0300
committerSantiago Pastorino <santiago@wyeworks.com>2010-08-23 23:10:36 -0300
commitbb75c337543a310ac6bed6f8e3287acf1592dac1 (patch)
tree5c2bd4eaecc7b7160302c891efe7d73a0302915b /railties/lib/rails/generators
parent6f4d100761f3dd453e9049837c61d6cf025fc03c (diff)
downloadrails-bb75c337543a310ac6bed6f8e3287acf1592dac1.tar.gz
rails-bb75c337543a310ac6bed6f8e3287acf1592dac1.tar.bz2
rails-bb75c337543a310ac6bed6f8e3287acf1592dac1.zip
Config is deprecated on 1.8.8 and 1.9.3 use RbConfig
Diffstat (limited to 'railties/lib/rails/generators')
-rw-r--r--railties/lib/rails/generators/actions.rb4
-rw-r--r--railties/lib/rails/generators/rails/app/app_generator.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/railties/lib/rails/generators/actions.rb b/railties/lib/rails/generators/actions.rb
index 668ef48892..da64560d83 100644
--- a/railties/lib/rails/generators/actions.rb
+++ b/railties/lib/rails/generators/actions.rb
@@ -242,7 +242,7 @@ module Rails
def rake(command, options={})
log :rake, command
env = options[:env] || 'development'
- sudo = options[:sudo] && Config::CONFIG['host_os'] !~ /mswin|mingw/ ? 'sudo ' : ''
+ sudo = options[:sudo] && RbConfig::CONFIG['host_os'] !~ /mswin|mingw/ ? 'sudo ' : ''
in_root { run("#{sudo}#{extify(:rake)} #{command} RAILS_ENV=#{env}", :verbose => false) }
end
@@ -309,7 +309,7 @@ module Rails
# Add an extension to the given name based on the platform.
#
def extify(name)
- if Config::CONFIG['host_os'] =~ /mswin|mingw/
+ if RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
"#{name}.bat"
else
name
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index a90f109844..75418ac689 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -415,7 +415,7 @@ module Rails
"/opt/local/var/run/mysql4/mysqld.sock", # mac + darwinports + mysql4
"/opt/local/var/run/mysql5/mysqld.sock", # mac + darwinports + mysql5
"/opt/lampp/var/mysql/mysql.sock" # xampp for linux
- ].find { |f| File.exist?(f) } unless Config::CONFIG['host_os'] =~ /mswin|mingw/
+ ].find { |f| File.exist?(f) } unless RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
end
def empty_directory_with_gitkeep(destination, config = {})