a92ee838f3e6b1a8dba548673555ebd514939324

Author
Marc Cornellà <hello@mcornella.com>
Committer
Marc Cornellà <hello@mcornella.com>
Date

Message

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

Diff

 1diff --git a/lib/cli.zsh b/lib/cli.zsh
 2index 8cf8368e6d92864a44664a4526a5674fe81cd2bd..0a85402df8c500eb184f3e2034d765acd7cdf2c3 100644
 3--- a/lib/cli.zsh
 4+++ b/lib/cli.zsh
 5@@ -61,7 +61,7 @@ function _omz {
 6           # if command is "disable", only offer already enabled plugins
 7           valid_plugins=($plugins)
 8         else
 9-          valid_plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(.N:h:t))
10+          valid_plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(-.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(-.N:h:t))
11           # if command is "enable", remove already enabled plugins
12           [[ "${words[3]}" = enable ]] && valid_plugins=(${valid_plugins:|plugins})
13         fi
14@@ -69,11 +69,11 @@ function _omz {
15         _describe 'plugin' valid_plugins ;;
16       plugin::info)
17         local -aU plugins
18-        plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(.N:h:t))
19+        plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(-.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(-.N:h:t))
20         _describe 'plugin' plugins ;;
21       theme::(set|use))
22         local -aU themes
23-        themes=("$ZSH"/themes/*.zsh-theme(.N:t:r) "$ZSH_CUSTOM"/**/*.zsh-theme(.N:r:gs:"$ZSH_CUSTOM"/themes/:::gs:"$ZSH_CUSTOM"/:::))
24+        themes=("$ZSH"/themes/*.zsh-theme(-.N:t:r) "$ZSH_CUSTOM"/**/*.zsh-theme(-.N:r:gs:"$ZSH_CUSTOM"/themes/:::gs:"$ZSH_CUSTOM"/:::))
25         _describe 'theme' themes ;;
26     esac
27   elif (( CURRENT > 4 )); then
28@@ -85,7 +85,7 @@ function _omz {
29           # if command is "disable", only offer already enabled plugins
30           valid_plugins=($plugins)
31         else
32-          valid_plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(.N:h:t))
33+          valid_plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(-.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(-.N:h:t))
34           # if command is "enable", remove already enabled plugins
35           [[ "${words[3]}" = enable ]] && valid_plugins=(${valid_plugins:|plugins})
36         fi