aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-03-06 11:42:17 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-03-06 11:42:17 +0000
commitdb41d2dd5c738ca44a07330cf02e9d817fedc34c (patch)
tree9715f9041c169e56ec2124e5e7cee93c78ef06b6
parent5da277b182604cef0ea68f79462568cb52af6706 (diff)
downloadrails-db41d2dd5c738ca44a07330cf02e9d817fedc34c.tar.gz
rails-db41d2dd5c738ca44a07330cf02e9d817fedc34c.tar.bz2
rails-db41d2dd5c738ca44a07330cf02e9d817fedc34c.zip
Fixed -h/--help for generate and destroy generators #331
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@832 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--railties/CHANGELOG2
-rw-r--r--railties/bin/destroy2
-rwxr-xr-xrailties/bin/generate2
3 files changed, 6 insertions, 0 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 7e0a4311f0..6d6a447f74 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Fixed -h/--help for generate and destroy generators #331
+
* Added begin/rescue around the FCGI dispatcher so no uncaught exceptions can bubble up to kill the process (logs to log/fastcgi.crash.log)
* Fixed that association#count would produce invalid sql when called sequentialy #659 [kanis@comcard.de]
diff --git a/railties/bin/destroy b/railties/bin/destroy
index ba6dc7703f..f9d9d181a4 100644
--- a/railties/bin/destroy
+++ b/railties/bin/destroy
@@ -2,4 +2,6 @@
require File.dirname(__FILE__) + '/../config/environment'
require 'rails_generator'
require 'rails_generator/scripts/destroy'
+
+ARGV.shift if ['--help', '-h'].include?(ARGV[0])
Rails::Generator::Scripts::Destroy.new.run(ARGV)
diff --git a/railties/bin/generate b/railties/bin/generate
index dde69e61a1..43bcfd0cb1 100755
--- a/railties/bin/generate
+++ b/railties/bin/generate
@@ -2,4 +2,6 @@
require File.dirname(__FILE__) + '/../config/environment'
require 'rails_generator'
require 'rails_generator/scripts/generate'
+
+ARGV.shift if ['--help', '-h'].include?(ARGV[0])
Rails::Generator::Scripts::Generate.new.run(ARGV)