1 files changed, 9 insertions, 5 deletions
diff --git a/lib/bundler/setup.rb b/lib/bundler/setup.rb
index 3930d1607c..dd658cd833 100644
--- a/lib/bundler/setup.rb
+++ b/lib/bundler/setup.rb
@@ -2,12 +2,16 @@ require 'bundler/shared_helpers'
 
 if Bundler::SharedHelpers.in_bundle?
   require 'bundler'
-  begin
+  if STDOUT.tty?
+    begin
+      Bundler.setup
+    rescue Bundler::BundlerError => e
+      puts "\e[31m#{e.message}\e[0m"
+      puts e.backtrace.join("\n") if ENV["DEBUG"]
+      exit e.status_code
+    end
+  else
     Bundler.setup
-  rescue Bundler::BundlerError => e
-    puts "\e[31m#{e.message}\e[0m"
-    puts e.backtrace.join("\n") if ENV["DEBUG"]
-    exit e.status_code
   end
 
   # Add bundler to the load path after disabling system gems