Rename variables.

This commit is contained in:
Sebastian Gniazdowski 2020-07-23 16:43:16 +02:00
parent baec94cec8
commit 7c9f1c74aa
2 changed files with 9 additions and 9 deletions

View file

@ -11,7 +11,7 @@
local type=$1 id=$2 id_as=$3 args=$4 ices=$5 hook=$6 subtype=$7
if (( $+ZINIT_ICE[debug] )) {
if (( $+ICE[debug] )) {
# Enable the output from this annex
integer ibshow_messages=1 ibdebug=1
}
@ -19,13 +19,13 @@
# Apply the default ices first.
local -a ices
ices=( "${(@Q)${(@z)Zinit_Annex_Meta_Plugins[default-ices]}}" )
(( ${#ices} > 0 && ${#ices} % 2 == 0 )) && ZINIT_ICE=( "${(@kv)ZINIT_ICE}" "${ices[@]}" )
(( ${#ices} > 0 && ${#ices} % 2 == 0 )) && ICE=( "${(@kv)ICE}" "${ices[@]}" )
# Exclude IDs with slashes and also packages
[[ $id == */* ]] && local bad_id=1
[[ $id == *:* ]] && local bad_id2=1
[[ $ZINIT_ICE[teleid] == */* ]] && local bad_tele=1
(( $+ZINIT_ICE[pack] )) && local is_pack=1
[[ $ICE[teleid] == */* ]] && local bad_tele=1
(( $+ICE[pack] )) && local is_pack=1
if (( bad_id || bad_id2 || bad_tele || is_pack )) {
if (( ibdebug )) {
local -a msgs
@ -66,7 +66,7 @@
local p
# Detect if any plugins should be skipped on-demand, via skip''.
on_demand_cand=( ${(@)${(@ps:\t:)${(@s: :)${(@s.;.)ZINIT_ICE[skip]}}}} )
on_demand_cand=( ${(@)${(@ps:\t:)${(@s: :)${(@s.;.)ICE[skip]}}}} )
for p ( $on_demand_cand ) {
integer idx1 count=1
local pattern="(*/$p*|$p*|*$p|*-$p*|*$p-*)"

View file

@ -18,7 +18,7 @@
integer retval
[[ $1 == default-ice ]] && { shift; integer eas_subcommand=1; }
integer ibdebug=$+ZINIT_ICE[debug]
integer ibdebug=$+ICE[debug]
# -D - clear out the recognized options
# -E - allow mixing of options and non-options
@ -55,13 +55,13 @@
return $?
}
local -A ZINIT_ICES
local -A ICES
.zinit-ice "$@"
integer iceret=$?
Zinit_Annex_Meta_Plugins[default-ices]=${(j: :)${(@qkv)ZINIT_ICES}}
Zinit_Annex_Meta_Plugins[default-ices]=${(j: :)${(@qkv)ICES}}
+zinit-message "{pre}default-ice:{rst}{msg} Stored the ices{ehi}:{rst}" \
"${(j: :)${(@q-kv)ZINIT_ICES}}.{rst}"
"${(j: :)${(@q-kv)ICES}}.{rst}"
}
# vim:ft=zsh:sw=4:sts=4:et: