From 91b97eca86a22376af5b7636efe6125b3a323ab5 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Wed, 15 Dec 2004 16:35:36 +0000
Subject: git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@172
 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

---
 railties/bin/generate    | 41 +++++++++++++++++++++++++++++++++++++++++
 railties/bin/generate.rb | 41 -----------------------------------------
 2 files changed, 41 insertions(+), 41 deletions(-)
 create mode 100755 railties/bin/generate
 delete mode 100755 railties/bin/generate.rb

(limited to 'railties/bin')

diff --git a/railties/bin/generate b/railties/bin/generate
new file mode 100755
index 0000000000..8f2f1497d6
--- /dev/null
+++ b/railties/bin/generate
@@ -0,0 +1,41 @@
+#!/usr/local/bin/ruby
+require File.dirname(__FILE__) + '/../config/environment'
+require 'rails_generator'
+
+unless ARGV.empty?
+  begin
+    name = ARGV.shift
+    Rails::Generator.instance(name, ARGV).generate
+  rescue Rails::Generator::UsageError => e
+    puts e.message
+  end
+else
+  builtin_generators = Rails::Generator.builtin_generators.join(', ')
+  contrib_generators = Rails::Generator.contrib_generators.join(', ')
+
+  $stderr.puts <<end_usage
+  #{$0} generator [args]
+
+  Rails comes with #{builtin_generators} generators.
+    #{$0} controller Login login logout
+    #{$0} model Account
+    #{$0} mailer AccountMailer
+    #{$0} scaffold Account action another_action
+
+end_usage
+
+  unless contrib_generators.empty?
+    $stderr.puts "  Installed generators (in #{RAILS_ROOT}/generators):"
+    $stderr.puts "    #{contrib_generators}"
+    $stderr.puts
+  end
+
+  $stderr.puts <<end_usage
+  More generators are available at http://rubyonrails.org
+    1. Download, for example, auth_controller.zip
+    2. Unzip to directory #{RAILS_ROOT}/generators/auth_controller
+    3. Generate without args for usage information
+         #{$0} auth_controller
+end_usage
+  exit 0
+end
diff --git a/railties/bin/generate.rb b/railties/bin/generate.rb
deleted file mode 100755
index 8f2f1497d6..0000000000
--- a/railties/bin/generate.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/local/bin/ruby
-require File.dirname(__FILE__) + '/../config/environment'
-require 'rails_generator'
-
-unless ARGV.empty?
-  begin
-    name = ARGV.shift
-    Rails::Generator.instance(name, ARGV).generate
-  rescue Rails::Generator::UsageError => e
-    puts e.message
-  end
-else
-  builtin_generators = Rails::Generator.builtin_generators.join(', ')
-  contrib_generators = Rails::Generator.contrib_generators.join(', ')
-
-  $stderr.puts <<end_usage
-  #{$0} generator [args]
-
-  Rails comes with #{builtin_generators} generators.
-    #{$0} controller Login login logout
-    #{$0} model Account
-    #{$0} mailer AccountMailer
-    #{$0} scaffold Account action another_action
-
-end_usage
-
-  unless contrib_generators.empty?
-    $stderr.puts "  Installed generators (in #{RAILS_ROOT}/generators):"
-    $stderr.puts "    #{contrib_generators}"
-    $stderr.puts
-  end
-
-  $stderr.puts <<end_usage
-  More generators are available at http://rubyonrails.org
-    1. Download, for example, auth_controller.zip
-    2. Unzip to directory #{RAILS_ROOT}/generators/auth_controller
-    3. Generate without args for usage information
-         #{$0} auth_controller
-end_usage
-  exit 0
-end
-- 
cgit v1.2.3