diff options
author | The Bundler Bot <bot@bundler.io> | 2018-04-07 06:25:36 +0000 |
---|---|---|
committer | Colby Swandale <me@colby.fyi> | 2018-04-20 10:28:36 +1000 |
commit | 5590e9bd81488fe3e33bd753dff8c53178fae17e (patch) | |
tree | 827a082017beafb044d7cab086ecc95342e29f34 | |
parent | 1946d006cac070c5734720a61e7ea6a69f5300e2 (diff) | |
download | bundler-5590e9bd81488fe3e33bd753dff8c53178fae17e.tar.gz |
Auto merge of #6466 - tduffield:bundler-check-length, r=segiddins
Bump the bundle_binstub check-length to 300 characters
Thanks so much for the contribution!
To make reviewing this PR a bit easier, please fill out answers to the following questions.
### What was the end-user problem that led to this PR?
I could not start a binstub binary.
### What was your diagnosis of the problem?
Some packaging systems require modifications to the hash-bang
interpreter path, making them longer than normal. One such example of
this is the habitat-sh/habitat project. The result is that the 150
character limit does not find the regex it is looking for, and prevents
an otherwise valid binary from starting.
### What is your fix for the problem, implemented in this PR?
This change doubles the length of the check from 150 characters to 300
characters. This change has been validated in an impacted environment.
### Why did you choose this fix out of the possible options?
It was the most straightforward.
(cherry picked from commit fb38825ead6603588dae17b34b23f282548ee425)
-rw-r--r-- | lib/bundler/templates/Executable | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bundler/templates/Executable b/lib/bundler/templates/Executable index 414a75898d..3e8d5b317a 100644 --- a/lib/bundler/templates/Executable +++ b/lib/bundler/templates/Executable @@ -15,7 +15,7 @@ ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../<%= relative_gemfile_path %>", bundle_binstub = File.expand_path("../bundle", __FILE__) if File.file?(bundle_binstub) - if File.read(bundle_binstub, 150) =~ /This file was generated by Bundler/ + if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/ load(bundle_binstub) else abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run. |