public/zsh-nvm
1
0
Fork 0
mirror of https://github.com/lukechilds/zsh-nvm.git synced 2025-01-30 09:47:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

revert the previous change and replace it with an optimized version of the functionality

Browse Source
This commit is contained in:
Eric Henderson 2022-06-07 13:24:22 -04:00
parent 9af1493550
commit e57f45a3d0
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
zsh-nvm.plugin.zsh
View File

@ -161,6 +161,24 @@ _zsh_nvm_revert() {
fi fi
} }
_current_node_version() {
local node_path="$(command which node 2>/dev/null)"
if [[ -z "${node_path##$NVM_DIR*}" ]]; then
node --version 2>/dev/null
else
printf 'system'
fi
}
_nvm_default_version() {
local alias="$(nvm_resolve_alias default)"
if [[ "$alias" = 'node' ]]; then
nvm_ls node | nvm_grep -e '^v' | nvm_grep -v -e "^v0" | tail -n 1
else
nvm version default
fi
}
autoload -U add-zsh-hook autoload -U add-zsh-hook
_zsh_nvm_auto_use() { _zsh_nvm_auto_use() {
_zsh_nvm_has nvm_find_nvmrc || return _zsh_nvm_has nvm_find_nvmrc || return
@ -168,10 +186,10 @@ _zsh_nvm_auto_use() {
return return
fi fi
local node_version="$(_current_node_version)"
local nvmrc_path="$(nvm_find_nvmrc)" local nvmrc_path="$(nvm_find_nvmrc)"
if [[ -n "$nvmrc_path" ]]; then if [[ -n "$nvmrc_path" ]]; then
local node_version="$(nvm version)"
local nvmrc_dir="$(dirname "$nvmrc_path")" local nvmrc_dir="$(dirname "$nvmrc_path")"
local nvmrc_version="$(cat "$nvmrc_path")" local nvmrc_version="$(cat "$nvmrc_path")"
local nvmrc_node_version="$(nvm version $(cat "$nvmrc_path"))" local nvmrc_node_version="$(nvm version $(cat "$nvmrc_path"))"
@ -185,7 +203,7 @@ _zsh_nvm_auto_use() {
elif [[ "$nvmrc_node_version" != "$node_version" ]]; then elif [[ "$nvmrc_node_version" != "$node_version" ]]; then
nvm use && export NVM_AUTO_USE_ACTIVE=true nvm use && export NVM_AUTO_USE_ACTIVE=true
fi fi
elif [[ "$node_version" != "$(nvm version default)" ]] && [[ "$NVM_AUTO_USE_ACTIVE" = true ]]; then elif [[ "$NVM_AUTO_USE_ACTIVE" = true ]] && [[ "$node_version" != "$(_nvm_default_version)" ]]; then
echo "Reverting to nvm default version" echo "Reverting to nvm default version"
nvm use default nvm use default
fi fi