diff options
| author | José Valim <jose.valim@gmail.com> | 2011-09-12 09:05:11 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-09-12 09:05:11 -0700 |
| commit | 11fa70dd0903a75f2a507dd609ea640e8ec99373 (patch) | |
| tree | 43466e22a3d1e6dc119b00fe08dff9ca1f2b8dae | |
| parent | 63082af306b3da34a5c888d19eef7314a4ef06e6 (diff) | |
| download | rails-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.
| -rwxr-xr-x | bin/rails | 7 | ||||
| -rw-r--r-- | rails.gemspec | 2 | ||||
| -rwxr-xr-x | railties/bin/rails | 7 |
3 files changed, 7 insertions, 9 deletions
diff --git a/bin/rails b/bin/rails deleted file mode 100755 index f9725d78d0..0000000000 --- a/bin/rails +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env ruby - -if File.exists?(File.join(File.expand_path('../..', __FILE__), '.git')) - railties_path = File.expand_path('../../railties/lib', __FILE__) - $:.unshift(railties_path) -end -require "rails/cli" diff --git a/rails.gemspec b/rails.gemspec index bb3fe85c2b..3377b4e175 100644 --- 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 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" |