Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

revert patched file

  • Loading branch information...
commit fd98b3a47256132c6c0a1be2970ad5983425a3ad 1 parent a0f2af1
Christian Meier authored March 15, 2011

Showing 1 changed file with 3 additions and 19 deletions. Show diff stats Hide diff stats

  1. 22  demo/config/boot.rb
22  demo/config/boot.rb
... ...
@@ -1,22 +1,6 @@
1  
-#patched my rail3-maven-plugin to allow custom Gemfile names
2 1
 require 'rubygems'
3 2
 
4  
-gemfile = ''
5  
-if defined?(JRUBY_VERSION)
6  
-  require 'java'
7  
-  ENV['BUNDLE_GEMFILE'] ||= java.lang.System.getProperty("bundle.gemfile")
8  
-  gemfile = ENV['BUNDLE_GEMFILE'].to_s
9  
-  File.delete(gemfile + ".lock") if File.exist?(gemfile + ".lock")
10  
-end
11  
-
12 3
 # Set up gems listed in the Gemfile.
13  
-gemfile = File.expand_path('../../Gemfile', __FILE__) unless File.exist?(gemfile)
14  
-begin
15  
-  ENV['BUNDLE_GEMFILE'] = gemfile
16  
-  require 'bundler'
17  
-  Bundler.setup
18  
-rescue Bundler::GemNotFound => e
19  
-  STDERR.puts e.message
20  
-  STDERR.puts "Try running `bundle install`." if defined?(JRUBY_VERSION) && java.lang.System.getProperty("maven.home").nil? || !defined?(JRUBY_VERSION)
21  
-  exit!
22  
-end if File.exist?(gemfile) || ENV['BUNDLE_GEMFILE']
  4
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
  5
+
  6
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])

0 notes on commit fd98b3a

Please sign in to comment.
Something went wrong with that request. Please try again.