diff options
Diffstat (limited to 'lib/bundler/setup.rb')
| -rw-r--r-- | lib/bundler/setup.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/bundler/setup.rb b/lib/bundler/setup.rb index c888dabf2c..8b4b479778 100644 --- a/lib/bundler/setup.rb +++ b/lib/bundler/setup.rb @@ -20,9 +20,12 @@ if Bundler::SharedHelpers.in_bundle? Bundler.setup end - # Add bundler to the load path after disabling system gems - bundler_lib = File.expand_path("../..", __FILE__) - $LOAD_PATH.unshift(bundler_lib) unless $LOAD_PATH.include?(bundler_lib) + unless ENV["BUNDLE_POSTIT_TRAMPOLINING_VERSION"] + # Add bundler to the load path after disabling system gems + # This is guarenteed to be done already if we've trampolined + bundler_lib = File.expand_path("../..", __FILE__) + $LOAD_PATH.unshift(bundler_lib) unless $LOAD_PATH.include?(bundler_lib) + end Bundler.ui = nil end |