From b0645ea04c7f75769b106d96a4fbb4e8cc2a258c Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Wed, 30 Oct 2013 16:51:07 -0700 Subject: avoid object creation if there is no rc file --- railties/lib/rails/generators/rails/app/app_generator.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3