Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

revert patched file

  • Loading branch information...
commit fd98b3a47256132c6c0a1be2970ad5983425a3ad 1 parent a0f2af1
@mkristian authored
Showing with 3 additions and 19 deletions.
  1. +3 −19 demo/config/boot.rb
View
22 demo/config/boot.rb
@@ -1,22 +1,6 @@
-#patched my rail3-maven-plugin to allow custom Gemfile names
require 'rubygems'
-gemfile = ''
-if defined?(JRUBY_VERSION)
- require 'java'
- ENV['BUNDLE_GEMFILE'] ||= java.lang.System.getProperty("bundle.gemfile")
- gemfile = ENV['BUNDLE_GEMFILE'].to_s
- File.delete(gemfile + ".lock") if File.exist?(gemfile + ".lock")
-end
-
# Set up gems listed in the Gemfile.
-gemfile = File.expand_path('../../Gemfile', __FILE__) unless File.exist?(gemfile)
-begin
- ENV['BUNDLE_GEMFILE'] = gemfile
- require 'bundler'
- Bundler.setup
-rescue Bundler::GemNotFound => e
- STDERR.puts e.message
- STDERR.puts "Try running `bundle install`." if defined?(JRUBY_VERSION) && java.lang.System.getProperty("maven.home").nil? || !defined?(JRUBY_VERSION)
- exit!
-end if File.exist?(gemfile) || ENV['BUNDLE_GEMFILE']
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
Please sign in to comment.
Something went wrong with that request. Please try again.