dcarrillo/prezto
1
0
Fork 0
mirror of https://github.com/dcarrillo/prezto.git synced 2024-12-22 12:48:01 +00:00
Code Issues Releases Wiki Activity

node: Cleanup and optimize 'node' module

Browse Source 
Changes:
- Simplify nodenv and nvm initialization
- Check for availability of `nodenv` or `nvm` function instead of command
- Unset local variables outside condition block
This commit is contained in:
Indrajit Raychaudhuri 2021-05-26 00:21:35 -05:00 committed by Indrajit Raychaudhuri
parent f1e24d3fd8
commit 6833fcd2f2
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
modules/node/init.zsh
View File

@ -8,33 +8,33 @@
# Indrajit Raychaudhuri <irc@indrajit.com> # Indrajit Raychaudhuri <irc@indrajit.com>
# #
# Possible lookup locations. # Possible lookup locations for manually installed nodenv and nvm.
local_nodenv_paths=({$NODENV_ROOT,{$XDG_CONFIG_HOME/,$HOME/.}nodenv}/bin/nodenv(N)) local_nodenv_paths=({$NODENV_ROOT,{$XDG_CONFIG_HOME/,$HOME/.}nodenv}/bin/nodenv(N))
local_nvm_paths=({$NVM_DIR,{$XDG_CONFIG_HOME/,$HOME/.}nvm}/nvm.sh(N)) local_nvm_paths=({$NVM_DIR,{$XDG_CONFIG_HOME/,$HOME/.}nvm}/nvm.sh(N))
# Load manually installed nodenv into the shell session. # Load manually installed or package manager installed nodenv into the shell
if [[ -s ${local_nodenv::=$local_nodenv_paths[1]} ]]; then # session.
path=("$local_nodenv:h" $path) if (( $#local_nodenv_paths || $+commands[nodenv] )); then
eval "$(nodenv init - --no-rehash zsh)"
unset local_nodenv{,_paths}
# Load package manager installed nodenv into the shell session. # Ensure manually installed nodenv is added to path when present.
elif (( $+commands[nodenv] )); then [[ -s $local_nodenv_paths[1] ]] && path=($local_nodenv_paths[1]:h $path)
eval "$(nodenv init - --no-rehash zsh)"
# Load manually installed NVM into the shell session. eval "$(nodenv init - zsh)"
elif [[ -s ${local_nvm::=$local_nvm_paths[1]} ]]; then
source "$local_nvm" --no-use
unset local_nvm{,_paths}
# Load package manager installed NVM into the shell session. # Load manually installed nvm into the shell session.
elif (( $#local_nvm_paths )); then
source "$local_nvm_paths[1]" --no-use
# Load package manager installed nvm into the shell session.
elif (( $+commands[brew] )) \ elif (( $+commands[brew] )) \
&& [[ -d "${nvm_prefix::="$(brew --prefix nvm 2> /dev/null)"}" ]]; then && [[ -d "${nvm_path::="$(brew --prefix 2> /dev/null)"/opt/nvm}" ]]; then
source "$nvm_prefix/nvm.sh" --no-use source "$nvm_path/nvm.sh" --no-use
unset nvm_prefix fi
unset local_n{odenv,vm}_paths nvm_path
# Return if requirements are not found. # Return if requirements are not found.
elif (( ! $+commands[node] )); then if (( ! $+commands[node] && ! $#functions[(i)n(odenv|vm)] )); then
return 1 return 1
fi fi