Permalink
Browse files

AppGenerator: use options instead of @options

  • Loading branch information...
drogus authored and vijaydev committed Dec 15, 2010
1 parent bb89f86 commit 875bbd58b4175a1219c5f7615946d0b89e51182d
Showing with 3 additions and 3 deletions.
  1. +3 −3 railties/lib/rails/generators/rails/app/app_generator.rb
@@ -63,7 +63,7 @@ def config
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 @@ def javascripts
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"

0 comments on commit 875bbd5

Please sign in to comment.