diff options
Diffstat (limited to 'lib/bundler/setup.rb')
| -rw-r--r-- | lib/bundler/setup.rb | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/lib/bundler/setup.rb b/lib/bundler/setup.rb index d156f494a8..48f3c7c323 100644 --- a/lib/bundler/setup.rb +++ b/lib/bundler/setup.rb @@ -5,25 +5,19 @@ require_relative "shared_helpers" if Bundler::SharedHelpers.in_bundle? require_relative "../bundler" - if STDOUT.tty? || ENV["BUNDLER_FORCE_TTY"] - Bundler.ui = Bundler::UI::Shell.new - begin - Bundler.setup - rescue Bundler::BundlerError => e - Bundler.ui.warn "\e[31m#{e.message}\e[0m" - Bundler.ui.warn e.backtrace.join("\n") if ENV["DEBUG"] - if e.is_a?(Bundler::GemNotFound) - Bundler.ui.warn "\e[33mRun `bundle install` to install missing gems.\e[0m" - end - exit e.status_code - end - else + Bundler.ui = Bundler::UI::Shell.new + begin Bundler.setup + rescue Bundler::BundlerError => e + Bundler.ui.warn "\e[31m#{e.message}\e[0m" + Bundler.ui.warn e.backtrace.join("\n") if ENV["DEBUG"] + if e.is_a?(Bundler::GemNotFound) + Bundler.ui.warn "\e[33mRun `bundle install` to install missing gems.\e[0m" + end + exit e.status_code 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) - - Bundler.ui = nil end |