mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
need to delete bin, not binstub, update wording
This commit is contained in:
parent
b77bbab25e
commit
99e1a4da99
1 changed files with 4 additions and 4 deletions
|
@ -24,10 +24,10 @@ module Rails
|
||||||
# this is a Bundler binstub, so we load the app ourselves
|
# this is a Bundler binstub, so we load the app ourselves
|
||||||
Object.const_set(:APP_PATH, File.expand_path('config/application', Dir.pwd))
|
Object.const_set(:APP_PATH, File.expand_path('config/application', Dir.pwd))
|
||||||
require File.expand_path('../boot', APP_PATH)
|
require File.expand_path('../boot', APP_PATH)
|
||||||
puts "Your bin/rails file has been overwritten by Bundler."
|
puts "Rails 4 no longer supports Bundler's --binstub option. You " \
|
||||||
puts "To update your bin/rails for Rails 4, please run: `bundle " \
|
"will need to disable it and update your bin/rails file.\n" \
|
||||||
"config --delete binstubs`, then `rm -rf bin`, then `rake " \
|
"Please run: `bundle config --delete bin && rm -rf bin`, then " \
|
||||||
"rails:update:bin`, then add bin/ to your source control."
|
"`rake rails:update:bin` and add the resulting bin/ to git."
|
||||||
require 'rails/commands'
|
require 'rails/commands'
|
||||||
end
|
end
|
||||||
rescue SystemCallError
|
rescue SystemCallError
|
||||||
|
|
Loading…
Reference in a new issue