summaryrefslogtreecommitdiff
path: root/exe
diff options
context:
space:
mode:
authorSamuel Giddins <segiddins@segiddins.me>2016-08-18 17:26:52 -0500
committerSamuel Giddins <segiddins@segiddins.me>2016-08-18 17:26:52 -0500
commit82d5938ad3c441eaa9cdc70b2b7148a4b2f59056 (patch)
treec2080fb7f6dee7f6863857d02597ef22f7d1e37c /exe
parent54ff7a4fb827ec36d5cac2fac843993f28b19077 (diff)
downloadbundler-82d5938ad3c441eaa9cdc70b2b7148a4b2f59056.tar.gz
[PostitTrampoline] Automatically enable when target version is >= 2seg-enable-trampoline-2.0
Diffstat (limited to 'exe')
-rwxr-xr-xexe/bundle10
1 files changed, 4 insertions, 6 deletions
diff --git a/exe/bundle b/exe/bundle
index 51a9035d97..ec88ea7552 100755
--- a/exe/bundle
+++ b/exe/bundle
@@ -4,12 +4,10 @@
# Exit cleanly from an early interrupt
Signal.trap("INT") { exit 1 }
-unless ENV["BUNDLE_DISABLE_POSTIT"]
- update = "update".start_with?(ARGV.first || " ") && ARGV.find {|a| a.start_with?("--bundler") }
- update &&= update =~ /--bundler(?:=(.+))?/ && $1 || "> 0.a"
- ENV["BUNDLER_VERSION"] = update if update
- require "bundler/postit_trampoline"
-end
+update = "update".start_with?(ARGV.first || " ") && ARGV.find {|a| a.start_with?("--bundler") }
+update &&= update =~ /--bundler(?:=(.+))?/ && $1 || "> 0.a"
+ENV["BUNDLER_VERSION"] = update if update
+require "bundler/postit_trampoline"
require "bundler"
# Check if an older version of bundler is installed