Fix bin dir

openpprn · May 10, 2014 · 11d3b01 · 11d3b01
1 parent 037d43e
commit 11d3b01
Show file tree

Hide file tree

Showing 29 changed files with 8 additions and 460 deletions.
diff --git a/bin/a2h b/bin/a2h
diff --git a/bin/autospec b/bin/autospec
diff --git a/bin/bcat b/bin/bcat
diff --git a/bin/btee b/bin/btee
diff --git a/bin/cdiff b/bin/cdiff
diff --git a/bin/cucumber b/bin/cucumber
diff --git a/bin/decolor b/bin/decolor
diff --git a/bin/edit_json.rb b/bin/edit_json.rb
diff --git a/bin/enum b/bin/enum
diff --git a/bin/erubis b/bin/erubis
diff --git a/bin/htmldiff b/bin/htmldiff
diff --git a/bin/launchy b/bin/launchy
diff --git a/bin/ldiff b/bin/ldiff
diff --git a/bin/nokogiri b/bin/nokogiri
diff --git a/bin/prettify_json.rb b/bin/prettify_json.rb
diff --git a/bin/rackup b/bin/rackup
diff --git a/bin/rails b/bin/rails
@@ -1,16 +1,12 @@
 #!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'rails' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
+# This command will automatically be run when you run "rails" with Rails 4 gems installed from the root of your application.
 
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+ENGINE_ROOT = File.expand_path('../..', __FILE__)
+ENGINE_PATH = File.expand_path('../../lib/forem/engine', __FILE__)
 
-require 'rubygems'
-require 'bundler/setup'
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
 
-load Gem.bin_path('railties', 'rails')
+require 'rails/all'
+require 'rails/engine/commands'
diff --git a/bin/rake b/bin/rake
diff --git a/bin/rake2thor b/bin/rake2thor
diff --git a/bin/rdiscount b/bin/rdiscount
diff --git a/bin/rdoc b/bin/rdoc
diff --git a/bin/redcarpet b/bin/redcarpet
diff --git a/bin/ri b/bin/ri