|
|
|
@ -45,7 +45,6 @@ function _omz_setup_autoload { |
|
|
|
# Autoload nvm when finding a .nvmrc file in the current directory |
|
|
|
# Autoload nvm when finding a .nvmrc file in the current directory |
|
|
|
# Adapted from: https://github.com/nvm-sh/nvm#zsh |
|
|
|
# Adapted from: https://github.com/nvm-sh/nvm#zsh |
|
|
|
function load-nvmrc { |
|
|
|
function load-nvmrc { |
|
|
|
local node_version="$(nvm version)" |
|
|
|
|
|
|
|
local nvmrc_path="$(nvm_find_nvmrc)" |
|
|
|
local nvmrc_path="$(nvm_find_nvmrc)" |
|
|
|
local nvm_silent="" |
|
|
|
local nvm_silent="" |
|
|
|
zstyle -t ':omz:plugins:nvm' silent-autoload && nvm_silent="--silent" |
|
|
|
zstyle -t ':omz:plugins:nvm' silent-autoload && nvm_silent="--silent" |
|
|
|
@ -58,10 +57,8 @@ function _omz_setup_autoload { |
|
|
|
elif [[ "$nvmrc_node_version" != "$node_version" ]]; then |
|
|
|
elif [[ "$nvmrc_node_version" != "$node_version" ]]; then |
|
|
|
nvm use $nvm_silent |
|
|
|
nvm use $nvm_silent |
|
|
|
fi |
|
|
|
fi |
|
|
|
elif [[ "$node_version" != "$(nvm version default)" ]]; then |
|
|
|
elif [[ -n "$(PWD=$OLDPWD nvm_find_nvmrc)" ]] && [[ "$(nvm version)" != "$(nvm version default)" ]]; then |
|
|
|
if [[ -z $nvm_silent ]]; then |
|
|
|
[[ -z $nvm_silent ]] && echo "Reverting to nvm default version" |
|
|
|
echo "Reverting to nvm default version" |
|
|
|
|
|
|
|
fi |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
nvm use default $nvm_silent |
|
|
|
nvm use default $nvm_silent |
|
|
|
fi |
|
|
|
fi |
|
|
|
|