Update zoxide to support Fish 4.1.x #1046
Open
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
This commit updates the fish init script to support the upcoming 4.1.x release of Fish by using `status get-file`. Fixes ajeetdsouza#1045
faho
reviewed
Apr 28, 2025
templates/fish.txt
Outdated
| @@ -19,7 +19,11 @@ end | |||
| # A copy of fish's internal cd function. This makes it possible to use | |||
| # `alias cd=z` without causing an infinite loop. | |||
| if ! builtin functions --query __zoxide_cd_internal | |||
| string replace --regex -- '^function cd\s' 'function __zoxide_cd_internal ' <$__fish_data_dir/functions/cd.fish | source | |||
| if status list-files functions/cd.fish >/dev/null | |||
| source (string replace --regex -- '^function cd\s' 'function __zoxide_cd_internal ' (status get-file functions/cd.fish) | psub -f) | |||
There was a problem hiding this comment.
Piping to source like above (and to string) is fine, shorter and works better:
status get-file functions/cd.fish | string replace --regex -- '^function cd\s' 'function __zoxide_cd_internal ' | sourceThere was a problem hiding this comment.
Switched to piping and reverted the 3.x case to the original.
krobelus
reviewed
Apr 28, 2025
templates/fish.txt
Outdated
| @@ -19,7 +19,11 @@ end | |||
| # A copy of fish's internal cd function. This makes it possible to use | |||
| # `alias cd=z` without causing an infinite loop. | |||
| if ! builtin functions --query __zoxide_cd_internal | |||
| string replace --regex -- '^function cd\s' 'function __zoxide_cd_internal ' <$__fish_data_dir/functions/cd.fish | source | |||
| if status list-files functions/cd.fish >/dev/null | |||
There was a problem hiding this comment.
this also needs 2>/dev/null (could use the &>/dev/null shorthand),
else it will print an error on fish version 3
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 commit updates the fish init script to support the upcoming 4.1.x release of Fish by using
status get-file.Fixes #1045