diff options
Diffstat (limited to 'plugins/fnm/fnm.plugin.zsh')
| -rw-r--r-- | plugins/fnm/fnm.plugin.zsh | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/plugins/fnm/fnm.plugin.zsh b/plugins/fnm/fnm.plugin.zsh index c161b27cd..e22588792 100644 --- a/plugins/fnm/fnm.plugin.zsh +++ b/plugins/fnm/fnm.plugin.zsh @@ -1,23 +1,26 @@ -if (( $+commands[fnm] )); then - # remove old generated completion file - command rm -f "${0:A:h}/_fnm" - - ver="$(fnm --version)" - ver_file="$ZSH_CACHE_DIR/fnm_version" - comp_file="$ZSH_CACHE_DIR/completions/_fnm" +if (( ! $+commands[fnm] )); then + return +fi - mkdir -p "${comp_file:h}" - (( ${fpath[(Ie)${comp_file:h}]} )) || fpath=("${comp_file:h}" $fpath) +# TODO: 2021-12-28: remove this block +# Handle $0 according to the standard: +# https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html +0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}" +0="${${(M)0:#/*}:-$PWD/$0}" +# remove old generated files +command rm -f "${0:A:h}/_fnm" "$ZSH_CACHE_DIR/fnm_version" - if [[ ! -f "$comp_file" || ! -f "$ver_file" || "$ver" != "$(< "$ver_file")" ]]; then - fnm completions --shell=zsh >| "$comp_file" - echo "$ver" >| "$ver_file" - fi +# TODO: 2021-12-28: remove this bit of code as it exists in oh-my-zsh.sh +# Add completions folder in $ZSH_CACHE_DIR +command mkdir -p "$ZSH_CACHE_DIR/completions" +(( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath) +# If the completion file doesn't exist yet, we need to autoload it and +# bind it to `fnm`. Otherwise, compinit will have already done that. +if [[ ! -f "$ZSH_CACHE_DIR/completions/_fnm" ]]; then declare -A _comps autoload -Uz _fnm _comps[fnm]=_fnm - - unset ver ver_file comp_file fi +fnm completions --shell=zsh >| "$ZSH_CACHE_DIR/completions/_fnm" &| |