Fix absolute path bug in .profile.d/ruby.sh $PATH #973
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
schneems
force-pushed
the
schneems/cd_bug_again
branch
from
5313891
to
99d296e
Compare
schneems
changed the title
schneems
force-pushed
the
schneems/cd_bug_again
branch
3 times, most recently
from
58607d7
to
7100cce
Compare
In #888 a relative path was accidentally introduced into the `.profile.d/ruby.sh` script: ``` export PATH="bin:$HOME/vendor/bundle/bin:$HOME/vendor/bundle/ruby/2.6.0/bin:$PATH" ``` That first path `bin` is relative and should be `$HOME/bin`. Without it, then changing into a different directory means that the system version of ruby will be used ``` ~ $ which ruby bin/ruby ~ $ mkdir foo; cd foo ~/foo $ which ruby /usr/bin/ruby ``` This is a regression was not caught by tests previously because the version of ruby that the test `cd_ruby` uses is 2.5.1 and that happens to match system ruby. To fix for catching future regressions the test is now more explicit. Unfortunately there's a bug in hatchet preventing that specific test heroku/hatchet#71 so instead I'm at least asserting that it's an absolute path.
schneems
force-pushed
the
schneems/cd_bug_again
branch
from
7100cce
to
0e52f71
Compare
Fix CNB case. In the CNB build process the `gem_layer_path` is not `$HOME` to ensure that `$HOME/bin` is always on the path, we can manually add it. If it gets added multiple times, we'll call `uniq` on the array before setting the override.
schneems
force-pushed
the
schneems/cd_bug_again
branch
from
f7df9ad
to
203e9ea
Compare
hone
reviewed
Apr 1, 2020
| @@ -211,7 +211,7 @@ def default_path(gem_layer_path = ".") | |||
| # need to remove bin/ folder since it links | |||
| # to the wrong --prefix ruby binstubs | |||
| # breaking require. This only applies to Ruby 1.9.2 and 1.8.7. | |||
| safe_binstubs = binstubs_relative_paths(gem_layer_path) - ["bin"] | |||
| safe_binstubs = binstubs_relative_paths(gem_layer_path) - ["bin", "#{gem_layer_path}/bin"] | |||
There was a problem hiding this comment.
we don't need bin here anymore right?
| @@ -429,13 +429,14 @@ def setup_export(layer = nil) | |||
| # sets up the profile.d script for this buildpack | |||
| def setup_profiled(ruby_layer_path = "$HOME", gem_layer_path = "$HOME") | |||
| instrument 'setup_profiled' do | |||
| profiled_path = binstubs_relative_paths(gem_layer_path) | |||
| profiled_path = ["$HOME/bin"] | |||
There was a problem hiding this comment.
is this redundant if $HOME is passed in?
hone
approved these changes
Apr 1, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In #888 a relative path was accidentally introduced into the
.profile.d/ruby.shscript:That first path
binis relative and should be$HOME/bin.Without an absolute path, changing into a different directory means that the system version of ruby will be used
This is a regression was not caught by tests previously because the version of ruby that the test
cd_rubyuses is 2.5.1 and that happens to match system ruby. To fix for catching future regressions the test is now more explicit.Unfortunately there's a bug in hatchet preventing that specific test heroku/hatchet#71 so instead I'm at least asserting that it's an absolute path.