Just provide the executable for railtie. This should be fine since Ru…

…bygems now warns before overriding them.
rails · Sep 12, 2011 · 11fa70d · 11fa70d
1 parent 63082af
commit 11fa70d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/bin/rails b/bin/rails
diff --git a/rails.gemspec b/rails.gemspec
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.homepage          = 'http://www.rubyonrails.org'
 
   s.bindir             = 'bin'
-  s.executables        = ['rails']
+  s.executables        = []
 
   s.add_dependency('activesupport',  version)
   s.add_dependency('actionpack',     version)

diff --git a/railties/bin/rails b/railties/bin/rails
@@ -1,2 +1,7 @@
 #!/usr/bin/env ruby
-require "rails/cli"
+
+if File.exists?(File.join(File.expand_path('../../..', __FILE__), '.git'))
+  railties_path = File.expand_path('../../lib', __FILE__)
+  $:.unshift(railties_path)
+end
+require "rails/cli"