Update config in a true Rails 4 way

3 files changed, 8 insertions, 6 deletions

diff --git a/bin/bundle b/bin/bundle
new file mode 100755
index 000000000..66e9889e8
--- /dev/null
+++ b/bin/bundle
@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')
diff --git a/bin/rails b/bin/rails
index 9587c07f0..7feb6a30e 100755
--- a/bin/rails
+++ b/bin/rails
@@ -1,10 +1,8 @@
-#!/usr/bin/env jruby
+#!/usr/bin/env ruby
 begin
   load File.expand_path("../spring", __FILE__)
 rescue LoadError
 end
-# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
-
 APP_PATH = File.expand_path('../../config/application',  __FILE__)
-require File.expand_path('../../config/boot',  __FILE__)
+require_relative '../config/boot'
 require 'rails/commands'
diff --git a/bin/rake b/bin/rake
index 0fb4e07e1..8017a0271 100755
--- a/bin/rake
+++ b/bin/rake
@@ -3,5 +3,6 @@ begin
   load File.expand_path("../spring", __FILE__)
 rescue LoadError
 end
-require 'bundler/setup'
-load Gem.bin_path('rake', 'rake')
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run