Do not cancel the entire Bash/Zsh initialization on mcfly initialization failure #425
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
The shell initialiation codes contain "return 1" at the top level. However, this causes the cancellation of the entire shell initialization because those codes are supposed to be evaluated as e.g. `eval "$(mcfly init bash)"`. The invocation of `return` in the eval'ed string takes an effect in the caller context of `eval`.
|
Thank you @akinomyoga! |
| [[ -t 0 ]] || return 0 | ||
|
|
||
| # Avoid loading this file more than once | ||
| [[ "$__MCFLY_LOADED" != "loaded" ]] || return 0 |
There was a problem hiding this comment.
[[ "$__YOUTACRANDSVA_LOADED" != "loaded" ]]
| # Avoid loading this file more than once | ||
| if [[ -t 0 ]] && [[ "$__MCFLY_LOADED" != "loaded" ]]; then | ||
| function mcfly_initialize { | ||
| unset -f "${FUNCNAME[0]}" |
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.
The shell initialiation codes contain
return 1at the top level. However, this causes the cancellation of the entire shell initialization because those codes are supposed to be evaluated as e.g.eval "$(mcfly init bash)". This is because the invocation ofreturnin the eval'ed string takes an effect in the caller context ofeval.For example, with the following
~/.bashrc,myaliaswould not be set up when the mcfly initialization fails because the mcfly initialization callsreturn 1at the top level, which cancels the execution of~/.bashrc(instead of just canceling the mcfly initialization).This PR fixes the problem by enclosing the entire mcfly initialization in a shell function (or an anonymous function in Zsh) and allows returning from the enclosing function.