From db877ef3ba283179c134c0625403137344513c10 Mon Sep 17 00:00:00 2001 From: Philipp Schmitt Date: Fri, 12 Nov 2021 12:03:42 +0100 Subject: [PATCH] zdharma -> &-continuum --- .gitignore | 2 +- ∧za-meta-plugins-before-load-handler | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index a97b969..41f8ad7 100644 --- a/.gitignore +++ b/.gitignore @@ -12,7 +12,7 @@ ._zinit .zinit_lastupd -# zdharma/zshelldoc tool's files +# zdharma-continuum/zshelldoc tool's files zsdoc/data # ohmyzsh/ohmyzsh/plugins/per-directory-history plugin's files diff --git a/∧za-meta-plugins-before-load-handler b/∧za-meta-plugins-before-load-handler index 66bc990..9f5a216 100644 --- a/∧za-meta-plugins-before-load-handler +++ b/∧za-meta-plugins-before-load-handler @@ -22,7 +22,7 @@ (( ${#ices} > 0 && ${#ices} % 2 == 0 )) && ICE=( "${(@kv)ICE}" "${ices[@]}" ) # Exclude IDs with slashes and also packages - [[ $id == */* ]] && local bad_id=1 + [[ $id == */* ]] && local bad_id=1 [[ $id == *:* ]] && local bad_id2=1 [[ $ICE[teleid] == */* ]] && local bad_tele=1 (( $+ICE[pack] )) && local is_pack=1 @@ -92,7 +92,7 @@ # Output a separating newline if the previous-processed # plugin isn't a meta-plugin → to cluster the messages. - [[ -z $Zinit_Annex_Meta_Plugins_Map[${ZINIT[annex-exposed-processed-IDs]##* }] ]] && builtin print + [[ -z $Zinit_Annex_Meta_Plugins_Map[${ZINIT[annex-exposed-processed-IDs]##* }] ]] && builtin print +zinit-message -n "{hi}$Zinit_Annex_Meta_Plugins_Map[recon-count].{rst} " +zinit-message -n "{pre}[meta-plugins annex]{msg} Loading" \ @@ -109,7 +109,7 @@ integer idx1=0 idx2=0 idx3=0 if (( ((idx1 = $loaded_plugins[(I)$p]) || (idx2 = $zsh_loaded_plugins[(I)$p])) && \ ! $not_existing[(I)$p] || (idx3 = $on_demand_skip[(I)$p]) - )) && [[ $p != zdharma/null ]] { + )) && [[ $p != zdharma-continuum/null ]] { idx3=$on_demand_skip[(I)$p] local idtxt="{dbg}${p//\//∕} " if (( (idx1 || idx2) && !idx3 )) { @@ -138,8 +138,8 @@ if (( ( $not_existing[(I)$p] || \ ! ($loaded_plugins[(I)$p] || $zsh_loaded_plugins[(I)$p]) ) && \ ! $on_demand_skip[(I)$p] - )) || [[ $p == zdharma/null ]] { - # The ↑zdharma/null↑ is a bogus exception, as this plugin will never + )) || [[ $p == zdharma-continuum/null ]] { + # The ↑zdharma-continuum/null↑ is a bogus exception, as this plugin will never # be loaded under the direct name. ZINIT[annex-before-load:new-@]+="$ice_list_data @${(q)p} " Zinit_Annex_Meta_Plugins[annex-loaded-plugins]+=" ${(q)p}"