diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-10-30 16:51:07 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-10-30 16:51:07 -0700 |
| commit | b0645ea04c7f75769b106d96a4fbb4e8cc2a258c (patch) | |
| tree | 14232229f467c6f73994b015aa3c2d6f047b8e71 /railties/lib | |
| parent | f7ae6e1cd650134a3a72362b756b65dffb68c453 (diff) | |
| download | rails-b0645ea04c7f75769b106d96a4fbb4e8cc2a258c.tar.gz rails-b0645ea04c7f75769b106d96a4fbb4e8cc2a258c.tar.bz2 rails-b0645ea04c7f75769b106d96a4fbb4e8cc2a258c.zip | |
avoid object creation if there is no rc file
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/app_generator.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index 20bbd0e073..d9f35de9da 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -363,7 +363,6 @@ module Rails end def read_rc_file(railsrc) - return [] unless File.exists?(railsrc) extra_args_string = File.read(railsrc) extra_args = extra_args_string.split(/\n+/).map {|l| l.split}.flatten puts "Using #{extra_args.join(" ")} from #{railsrc}" @@ -371,6 +370,7 @@ module Rails end def insert_railsrc_into_argv!(argv, railsrc) + return argv unless File.exists?(railsrc) extra_args = read_rc_file railsrc argv.take(1) + extra_args + argv.drop(1) end |