dolysis
/
ohmyzsh
3
0
Fork 0
Code Issues Pull Requests Releases Activity

fix(cli): fix zsh array syntax for szh 5.0.2

This commit is contained in:
Marc Cornellà 2021-10-05 11:58:39 +02:00
parent a54148a43e
commit b621eee21f
No known key found for this signature in database
GPG Key ID: 0314585E776A9C1B
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/cli.zsh
View File

@ -91,7 +91,8 @@ function _omz {
# NOTE: $(( CURRENT - 1 )) is the last plugin argument completely passed, i.e. that which # NOTE: $(( CURRENT - 1 )) is the last plugin argument completely passed, i.e. that which
# has a space after them. This is to avoid removing plugins partially passed, which makes # has a space after them. This is to avoid removing plugins partially passed, which makes
# the completion not add a space after the completed plugin. # the completion not add a space after the completed plugin.
local -a args=(${words[4,$(( CURRENT - 1))]}) local -a args
args=(${words[4,$(( CURRENT - 1))]})
valid_plugins=(${valid_plugins:|args}) valid_plugins=(${valid_plugins:|args})
_describe 'plugin' valid_plugins ;; _describe 'plugin' valid_plugins ;;
@ -214,7 +215,7 @@ function _omz::plugin::disable {
fi fi
# Check that plugin is in $plugins # Check that plugin is in $plugins
local -a dis_plugins=() local -a dis_plugins
for plugin in "$@"; do for plugin in "$@"; do
if [[ ${plugins[(Ie)$plugin]} -eq 0 ]]; then if [[ ${plugins[(Ie)$plugin]} -eq 0 ]]; then
_omz::log warn "plugin '$plugin' is not enabled." _omz::log warn "plugin '$plugin' is not enabled."
@ -303,7 +304,7 @@ function _omz::plugin::enable {
fi fi
# Check that plugin is not in $plugins # Check that plugin is not in $plugins
local -a add_plugins=() local -a add_plugins
for plugin in "$@"; do for plugin in "$@"; do
if [[ ${plugins[(Ie)$plugin]} -ne 0 ]]; then if [[ ${plugins[(Ie)$plugin]} -ne 0 ]]; then
_omz::log warn "plugin '$plugin' is already enabled." _omz::log warn "plugin '$plugin' is already enabled."
@ -424,10 +425,8 @@ function _omz::plugin::load {
return 1 return 1
fi fi
local plugins=("$@")
local plugin base has_completion=0 local plugin base has_completion=0
for plugin in "$@"; do
for plugin in $plugins; do
if [[ -d "$ZSH_CUSTOM/plugins/$plugin" ]]; then if [[ -d "$ZSH_CUSTOM/plugins/$plugin" ]]; then
base="$ZSH_CUSTOM/plugins/$plugin" base="$ZSH_CUSTOM/plugins/$plugin"
elif [[ -d "$ZSH/plugins/$plugin" ]]; then elif [[ -d "$ZSH/plugins/$plugin" ]]; then