aboutsummaryrefslogtreecommitdiffstats
path: root/railties/bin
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-09-12 09:05:11 -0700
committerJosé Valim <jose.valim@gmail.com>2011-09-12 09:05:11 -0700
commit11fa70dd0903a75f2a507dd609ea640e8ec99373 (patch)
tree43466e22a3d1e6dc119b00fe08dff9ca1f2b8dae /railties/bin
parent63082af306b3da34a5c888d19eef7314a4ef06e6 (diff)
downloadrails-11fa70dd0903a75f2a507dd609ea640e8ec99373.tar.gz
rails-11fa70dd0903a75f2a507dd609ea640e8ec99373.tar.bz2
rails-11fa70dd0903a75f2a507dd609ea640e8ec99373.zip
Just provide the executable for railtie. This should be fine since Rubygems now warns before overriding them.
Diffstat (limited to 'railties/bin')
-rwxr-xr-xrailties/bin/rails7
1 files changed, 6 insertions, 1 deletions
diff --git a/railties/bin/rails b/railties/bin/rails
index a7d6938e0d..a1c4faaa73 100755
--- a/railties/bin/rails
+++ b/railties/bin/rails
@@ -1,2 +1,7 @@
#!/usr/bin/env ruby
-require "rails/cli" \ No newline at end of file
+
+if File.exists?(File.join(File.expand_path('../../..', __FILE__), '.git'))
+ railties_path = File.expand_path('../../lib', __FILE__)
+ $:.unshift(railties_path)
+end
+require "rails/cli"