diff options
author | Piotr Sarnacki <drogus@gmail.com> | 2010-12-15 13:08:49 +0100 |
---|---|---|
committer | Piotr Sarnacki <drogus@gmail.com> | 2010-12-15 13:08:49 +0100 |
commit | 17afec0ae3fe9d8895a7e030f6bfb8443ae83be1 (patch) | |
tree | 465918c39728367e819cf05b381ec018d917a879 /railties/lib | |
parent | 2dafb14c287af2970ceb45ded9ab4e5ce109738f (diff) | |
download | rails-17afec0ae3fe9d8895a7e030f6bfb8443ae83be1.tar.gz rails-17afec0ae3fe9d8895a7e030f6bfb8443ae83be1.tar.bz2 rails-17afec0ae3fe9d8895a7e030f6bfb8443ae83be1.zip |
AppGenerator: use options instead of @options
Diffstat (limited to 'railties/lib')
-rw-r--r-- | railties/lib/rails/generators/rails/app/app_generator.rb | 6 |
1 files changed, 3 insertions, 3 deletions
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" |