Refactor identifying generator's destination root

rails · May 27, 2011 · 5f00592 · 5f00592
1 parent a0ee227
commit 5f00592
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/railties/lib/rails/commands/generate.rb b/railties/lib/rails/commands/generate.rb
@@ -8,8 +8,5 @@
 
 name = ARGV.shift
 
-if defined?(ENGINE_ROOT)
+root = defined?(ENGINE_ROOT) ? ENGINE_ROOT : Rails.root
-  Rails::Generators.invoke name, ARGV, :behavior => :invoke, :destination_root => ENGINE_ROOT
+Rails::Generators.invoke name, ARGV, :behavior => :invoke, :destination_root => root
-else
-  Rails::Generators.invoke name, ARGV, :behavior => :invoke, :destination_root => Rails.root
-end