linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-12-12 20:21:02 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(cli): follow symlinks in plugin or theme completions

Browse source
This commit is contained in:
Marc Cornellà 2022-01-09 20:27:22 +01:00
parent c6e7f8905f
commit a92ee838f3
No known key found for this signature in database
GPG key ID: 0314585E776A9C1B
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/cli.zsh
View file

@ -61,7 +61,7 @@ function _omz {
# if command is "disable", only offer already enabled plugins # if command is "disable", only offer already enabled plugins
valid_plugins=($plugins) valid_plugins=($plugins)
else else
valid_plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(.N:h:t)) valid_plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(-.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(-.N:h:t))
# if command is "enable", remove already enabled plugins # if command is "enable", remove already enabled plugins
[[ "${words[3]}" = enable ]] && valid_plugins=(${valid_plugins:|plugins}) [[ "${words[3]}" = enable ]] && valid_plugins=(${valid_plugins:|plugins})
fi fi
@ -69,11 +69,11 @@ function _omz {
_describe 'plugin' valid_plugins ;; _describe 'plugin' valid_plugins ;;
plugin::info) plugin::info)
local -aU plugins local -aU plugins
plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(.N:h:t)) plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(-.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(-.N:h:t))
_describe 'plugin' plugins ;; _describe 'plugin' plugins ;;
theme::(set|use)) theme::(set|use))
local -aU themes local -aU themes
themes=("$ZSH"/themes/*.zsh-theme(.N:t:r) "$ZSH_CUSTOM"/**/*.zsh-theme(.N:r:gs:"$ZSH_CUSTOM"/themes/:::gs:"$ZSH_CUSTOM"/:::)) themes=("$ZSH"/themes/*.zsh-theme(-.N:t:r) "$ZSH_CUSTOM"/**/*.zsh-theme(-.N:r:gs:"$ZSH_CUSTOM"/themes/:::gs:"$ZSH_CUSTOM"/:::))
_describe 'theme' themes ;; _describe 'theme' themes ;;
esac esac
elif (( CURRENT > 4 )); then elif (( CURRENT > 4 )); then
@ -85,7 +85,7 @@ function _omz {
# if command is "disable", only offer already enabled plugins # if command is "disable", only offer already enabled plugins
valid_plugins=($plugins) valid_plugins=($plugins)
else else
valid_plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(.N:h:t)) valid_plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(-.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(-.N:h:t))
# if command is "enable", remove already enabled plugins # if command is "enable", remove already enabled plugins
[[ "${words[3]}" = enable ]] && valid_plugins=(${valid_plugins:|plugins}) [[ "${words[3]}" = enable ]] && valid_plugins=(${valid_plugins:|plugins})
fi fi