summaryrefslogtreecommitdiff
path: root/lib/bundler/setup.rb
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2015-01-19 13:08:18 -0800
committerAndre Arko <andre@arko.net>2015-01-19 13:10:13 -0800
commitd3922e972570f6bd1144dfeade35d81b5830ac6e (patch)
tree1ea80715b49fe1a42936f43dc2912c055487440a /lib/bundler/setup.rb
parent05d80d18ce71ff0c72fbc42a643e01905d3b8f7f (diff)
downloadbundler-d3922e972570f6bd1144dfeade35d81b5830ac6e.tar.gz
force TTY only in tests instead of all exec
Diffstat (limited to 'lib/bundler/setup.rb')
-rw-r--r--lib/bundler/setup.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/bundler/setup.rb b/lib/bundler/setup.rb
index ff47926c36..6bf598337e 100644
--- a/lib/bundler/setup.rb
+++ b/lib/bundler/setup.rb
@@ -2,7 +2,8 @@ require 'bundler/shared_helpers'
if Bundler::SharedHelpers.in_bundle?
require 'bundler'
- if STDOUT.tty? || ENV['FORCE_TTY']
+
+ if STDOUT.tty? || ENV['BUNDLER_FORCE_TTY']
begin
Bundler.setup
rescue Bundler::BundlerError => e