[init-hooks] Prevent init hook recursion #1709
Merged
Conversation
This file contains hidden or 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
savil
approved these changes
Jan 9, 2024
mikeland73
added a commit
that referenced
this pull request
Jan 9, 2024
## Summary Fixes an issue with #1709 Also, adds a `FISH_VERSION` check which seems more reliable? (See fish-shell/fish-shell#374) I think longer term it may be better to generate different init hooks (e.g. `.hooks.fish`) instead. ## How was it tested? ``` SHELL=fish devbox shell refresh ```
mikeland73
added a commit
that referenced
this pull request
Jan 23, 2024
## Summary Fixes issue introduced in #1709 `devbox run` uses `sh` instead of native shell. So init hooks must always be `sh` compatible for `run`. On the other hand, `devbox shell` uses native shell so init hooks must be `fish` if the native shell is fish. This is ugly, but it's how it has always worked. #1709 introduced recursion protection that would be `fish` or `sh` depending on native shell. This worked fine for `devbox shell` but would break `devbox run`. This change fixes that by creating 2 hooks files, one fish and one sh and sourcing the correct one in shellrc, while still always using the `sh` for run. cc: @Lagoja ## How was it tested? ``` devbox run echo 5 devbox shell SHELL=fish devbox run echo 5 SHELL=fish devbox shell ```
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.
Summary
Fixes #1651
How was it tested?
Added a
devbox run echo foobarinto our init hook. Tested with