diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-02-01 21:27:06 -0800 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-02-01 21:27:06 -0800 |
| commit | 9cb386d9d6af513ca09b55df7765e3d38488e2ff (patch) | |
| tree | 1bed8850e33f15a7f30ef3d262bdd6862e332d58 /railties/lib | |
| parent | 3e1f23125dc04df7894f276f6e3d296e184c2b8c (diff) | |
| parent | 5f1dc8e3b74d4f4deb0617be6190a32256f4fe18 (diff) | |
| download | rails-9cb386d9d6af513ca09b55df7765e3d38488e2ff.tar.gz rails-9cb386d9d6af513ca09b55df7765e3d38488e2ff.tar.bz2 rails-9cb386d9d6af513ca09b55df7765e3d38488e2ff.zip | |
Merge pull request #9147 from amparo-luna/custom_rc
Add --rc option to support the load of a custom rc file
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/commands/application.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/railties/lib/rails/commands/application.rb b/railties/lib/rails/commands/application.rb index 8c1b20571c..92c9f9deb9 100644 --- a/railties/lib/rails/commands/application.rb +++ b/railties/lib/rails/commands/application.rb @@ -10,7 +10,13 @@ if ARGV.first != "new" else ARGV.shift unless ARGV.delete("--no-rc") - railsrc = File.join(File.expand_path("~"), ".railsrc") + customrc = ARGV.index('--rc') + railsrc = if customrc + ARGV.delete_at(customrc) + ARGV.delete_at(customrc) + else + File.join(File.expand_path("~"), '.railsrc') + end if File.exist?(railsrc) extra_args_string = File.read(railsrc) extra_args = extra_args_string.split(/\n+/).map {|l| l.split}.flatten |