Skip to content

O
oh-my-zsh
Unverified Commit a92ee838 authored by Marc Cornellà's avatar Marc Cornellà
Browse files
Options

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

parent c6e7f890
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
lib/cli.zsh
View file @ a92ee838
...@@ -61,7 +61,7 @@ function _omz { ...@@ -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 { ...@@ -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 { ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment