Fix #650 (second try) #716
Open
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
bbbco
reviewed
Jun 14, 2022
| @@ -46,7 +46,7 @@ cat > $ANTIGEN_CACHE <<EOC | |||
| $(functions -- _antigen) | |||
| antigen () { | |||
| local MATCH MBEGIN MEND | |||
| [[ "\$ZSH_EVAL_CONTEXT" =~ "toplevel:*" || "\$ZSH_EVAL_CONTEXT" =~ "cmdarg:*" ]] && source "$_ANTIGEN_INSTALL_DIR/antigen.zsh" && eval antigen \$@; | |||
There was a problem hiding this comment.
Shouldn't it be source "$_ANTIGEN_INSTALL_DIR/$_ANTIGEN_INSTALL_FILENAME" ... ?
There was a problem hiding this comment.
The code is correct, ${0:A} will resolve to /home/$USER/antigen.zsh for ex.
|
I wrote up an identical fix before realizing there was already an open PR for this. Can the above be merged? Tested on Ubuntu 24.04: Renamed
antigen () {
local MATCH MBEGIN MEND
[[ "$ZSH_EVAL_CONTEXT" =~ "toplevel:*" || "$ZSH_EVAL_CONTEXT" =~ "cmdarg:*" ]] && source "/home/xxxxxxx/someothername.zsh" && eval antigen $@;
return 0;
} |
simonmarty
approved these changes
Nov 21, 2024
| @@ -46,7 +46,7 @@ cat > $ANTIGEN_CACHE <<EOC | |||
| $(functions -- _antigen) | |||
| antigen () { | |||
| local MATCH MBEGIN MEND | |||
| [[ "\$ZSH_EVAL_CONTEXT" =~ "toplevel:*" || "\$ZSH_EVAL_CONTEXT" =~ "cmdarg:*" ]] && source "$_ANTIGEN_INSTALL_DIR/antigen.zsh" && eval antigen \$@; | |||
There was a problem hiding this comment.
The code is correct, ${0:A} will resolve to /home/$USER/antigen.zsh for ex.
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.
This is a second try to fix the long standing bug reported in #650 in January 2018.
The first attempt was made in PR #656, but was abandoned and never merged.
In a nutshell, this bug doesn't allow the installed script to be called anything different than
antigen.zsh, this is specially problematic if one wants to make antigen a hidden file. The proposed solution makes the name of the file dynamic.