summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2011-04-29 12:05:41 -0500
committerJoshua Peek <josh@joshpeek.com>2011-04-29 12:05:41 -0500
commitb8cd1168dc00e38944b5067ab59d13b4a967fc2f (patch)
tree655f0e771ed17c9ded56035b2951b2b31ebe13ec
parent7c6a566e1362a51435b8f6ac7efe59f0c3dc3022 (diff)
downloadbundler-b8cd1168dc00e38944b5067ab59d13b4a967fc2f.tar.gz
Only format error backtrace if stdout is tty
-rw-r--r--lib/bundler/setup.rb14
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