aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2010-04-13 18:01:36 -0300
committerwycats <wycats@gmail.com>2010-04-13 14:23:38 -0700
commitbd34df00cf7f9d4d123884095bd82f68c29279ce (patch)
treed7661a36021d4ea23223222b01d898de0644a7be
parent8e9df34fa3fd22719d939ba72f19b3ae9ffcc018 (diff)
downloadrails-bd34df00cf7f9d4d123884095bd82f68c29279ce.tar.gz
rails-bd34df00cf7f9d4d123884095bd82f68c29279ce.tar.bz2
rails-bd34df00cf7f9d4d123884095bd82f68c29279ce.zip
Bring back bin/rails to life on edge
-rwxr-xr-xbin/rails8
1 files changed, 7 insertions, 1 deletions
diff --git a/bin/rails b/bin/rails
index 853b1d75f9..4a74726e9b 100755
--- a/bin/rails
+++ b/bin/rails
@@ -1 +1,7 @@
-require 'rails/cli'
+begin
+ require "rails/cli"
+rescue LoadError
+ railties_path = File.expand_path('../../railties/lib', __FILE__)
+ $:.unshift(railties_path)
+ require "rails/cli"
+end