From d236827881d119fb9ad25c81ce8e7756f1966823 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Tue, 2 Feb 2010 15:50:56 -0800
Subject: Removed all the default commands in script/* and replaced them with
script/rails and a rails command that'll act the same when run from within
the app [DHH]
---
railties/bin/rails | 47 +++++++++++++++++++++++++----------------------
1 file changed, 25 insertions(+), 22 deletions(-)
(limited to 'railties/bin')
diff --git a/railties/bin/rails b/railties/bin/rails
index afcd9fd0be..44842e2234 100755
--- a/railties/bin/rails
+++ b/railties/bin/rails
@@ -1,27 +1,30 @@
-begin
- require 'rails/ruby_version_check'
-rescue LoadError
- # If people are not using gems, the load path must still
- # be correct.
- # TODO: Remove the begin / rescue block somehow
- $:.unshift File.expand_path('../../lib', __FILE__)
- $:.unshift File.expand_path('../../../activesupport/lib', __FILE__)
- $:.unshift File.expand_path('../../../actionpack/lib', __FILE__)
- require 'rails/ruby_version_check'
-end
+if File.exists?(Dir.getwd + '/script/rails')
+ exec(Dir.getwd + '/script/rails', *ARGV)
+else
+ begin
+ require 'rails/ruby_version_check'
+ rescue LoadError
+ # If people are not using gems, the load path must still
+ # be correct.
+ # TODO: Remove the begin / rescue block somehow
+ $:.unshift File.expand_path('../../lib', __FILE__)
+ $:.unshift File.expand_path('../../../activesupport/lib', __FILE__)
+ $:.unshift File.expand_path('../../../actionpack/lib', __FILE__)
+ require 'rails/ruby_version_check'
+ end
-Signal.trap("INT") { puts; exit }
+ Signal.trap("INT") { puts; exit }
-require 'rails/version'
-if %w(--version -v).include? ARGV.first
- puts "Rails #{Rails::VERSION::STRING}"
- exit(0)
-end
+ require 'rails/version'
+ if %w(--version -v).include? ARGV.first
+ puts "Rails #{Rails::VERSION::STRING}"
+ exit(0)
+ end
-ARGV << "--help" if ARGV.empty?
+ ARGV << "--help" if ARGV.empty?
+ require 'rails/generators'
+ require 'generators/rails/app/app_generator'
-require 'rails/generators'
-require 'generators/rails/app/app_generator'
-
-Rails::Generators::AppGenerator.start
+ Rails::Generators::AppGenerator.start
+end
\ No newline at end of file
--
cgit v1.2.3