aboutsummaryrefslogtreecommitdiffstats
path: root/railties/bin
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-02-15 01:45:35 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-02-15 01:45:35 +0000
commitb1999be5a7efd67e2602c37ed898aa8433661863 (patch)
tree03bc833276075d802d0ce0ad261baed3d7232533 /railties/bin
parent88a3343ed57c01ca358da8473d15fc4d2b4a5bff (diff)
downloadrails-b1999be5a7efd67e2602c37ed898aa8433661863.tar.gz
rails-b1999be5a7efd67e2602c37ed898aa8433661863.tar.bz2
rails-b1999be5a7efd67e2602c37ed898aa8433661863.zip
A hopefully more successful attempt at the Routing branch merge
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@617 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/bin')
-rw-r--r--railties/bin/destroy3
-rwxr-xr-xrailties/bin/generate3
-rwxr-xr-xrailties/bin/rails3
-rw-r--r--railties/bin/update3
4 files changed, 0 insertions, 12 deletions
diff --git a/railties/bin/destroy b/railties/bin/destroy
index 6c1848ce1e..ba6dc7703f 100644
--- a/railties/bin/destroy
+++ b/railties/bin/destroy
@@ -1,8 +1,5 @@
#!/usr/local/bin/ruby
require File.dirname(__FILE__) + '/../config/environment'
require 'rails_generator'
-require 'rails_generator/simple_logger'
require 'rails_generator/scripts/destroy'
-
-Rails::Generator::Base.logger = Rails::Generator::SimpleLogger.new(STDOUT)
Rails::Generator::Scripts::Destroy.new.run(ARGV)
diff --git a/railties/bin/generate b/railties/bin/generate
index 8bce002510..dde69e61a1 100755
--- a/railties/bin/generate
+++ b/railties/bin/generate
@@ -1,8 +1,5 @@
#!/usr/local/bin/ruby
require File.dirname(__FILE__) + '/../config/environment'
require 'rails_generator'
-require 'rails_generator/simple_logger'
require 'rails_generator/scripts/generate'
-
-Rails::Generator::Base.logger = Rails::Generator::SimpleLogger.new(STDOUT)
Rails::Generator::Scripts::Generate.new.run(ARGV)
diff --git a/railties/bin/rails b/railties/bin/rails
index da9b2af041..3d23b99609 100755
--- a/railties/bin/rails
+++ b/railties/bin/rails
@@ -1,7 +1,4 @@
require File.dirname(__FILE__) + '/../lib/rails_generator'
-require 'rails_generator/simple_logger'
require 'rails_generator/scripts/generate'
-
-Rails::Generator::Base.logger = Rails::Generator::SimpleLogger.new(STDOUT)
Rails::Generator::Base.use_application_sources!
Rails::Generator::Scripts::Generate.new.run(ARGV, :generator => 'app')
diff --git a/railties/bin/update b/railties/bin/update
index 64cc49cf02..430d325b07 100644
--- a/railties/bin/update
+++ b/railties/bin/update
@@ -1,8 +1,5 @@
#!/usr/local/bin/ruby
require File.dirname(__FILE__) + '/../config/environment'
require 'rails_generator'
-require 'rails_generator/simple_logger'
require 'rails_generator/scripts/update'
-
-Rails::Generator::Base.logger = Rails::Generator::SimpleLogger.new(STDOUT)
Rails::Generator::Scripts::Update.new.run(ARGV)