From 875bbd58b4175a1219c5f7615946d0b89e51182d Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Wed, 15 Dec 2010 13:08:49 +0100
Subject: AppGenerator: use options instead of @options
---
railties/lib/rails/generators/rails/app/app_generator.rb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'railties')
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index 94af9fe1e9..3f6ff35a86 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -63,7 +63,7 @@ module Rails
end
def database_yml
- template "config/databases/#{@options[:database]}.yml", "config/database.yml"
+ template "config/databases/#{options[:database]}.yml", "config/database.yml"
end
def db
@@ -106,8 +106,8 @@ module Rails
empty_directory "public/javascripts"
unless options[:skip_javascript]
- copy_file "public/javascripts/#{@options[:javascript]}.js"
- copy_file "public/javascripts/#{@options[:javascript]}_ujs.js", "public/javascripts/rails.js"
+ copy_file "public/javascripts/#{options[:javascript]}.js"
+ copy_file "public/javascripts/#{options[:javascript]}_ujs.js", "public/javascripts/rails.js"
if options[:javascript] == "prototype"
copy_file "public/javascripts/controls.js"
--
cgit v1.2.3