linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-01-23 02:35:38 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(nvm): update NVM_DIR handling for different NVM_SOURCE and NVM_DIR

Browse source
This commit is contained in:
Paradox 2025-10-28 04:44:29 +05:30
commit 2517370cad
1 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
plugins/nvm/nvm.plugin.zsh
View file

@ -20,10 +20,19 @@ if [[ -z "$NVM_DIR" ]] || [[ ! -f "$NVM_DIR/nvm.sh" ]]; then
return return
fi fi
if [[ -z "$NVM_SOURCE" ]]; then
if [[ -d "/usr/share/nvm" ]]; then
export NVM_SOURCE="/usr/share/nvm"
fi
else
export NVM_SOURCE=$NVM_DIR
fi
function _omz_nvm_setup_completion { function _omz_nvm_setup_completion {
local _nvm_completion local _nvm_completion
# Load nvm bash completion # Load nvm bash completion
for _nvm_completion in "$NVM_DIR/bash_completion" "$NVM_HOMEBREW/etc/bash_completion.d/nvm"; do for _nvm_completion in "$NVM_SOURCE/bash_completion" "$NVM_HOMEBREW/etc/bash_completion.d/nvm"; do
if [[ -f "$_nvm_completion" ]]; then if [[ -f "$_nvm_completion" ]]; then
# Load bashcompinit # Load bashcompinit
autoload -U +X bashcompinit && bashcompinit autoload -U +X bashcompinit && bashcompinit
@ -82,8 +91,8 @@ if zstyle -t ':omz:plugins:nvm' lazy; then
unfunction \$func unfunction \$func
fi fi
done done
# Load nvm if it exists in \$NVM_DIR # Load nvm if it exists in \$NVM_SOURCE
[[ -f \"\$NVM_DIR/nvm.sh\" ]] && source \"\$NVM_DIR/nvm.sh\" [[ -f \"\$NVM_SOURCE/nvm.sh\" ]] && source \"\$NVM_SOURCE/nvm.sh\"
_omz_nvm_setup_completion _omz_nvm_setup_completion
_omz_nvm_setup_autoload _omz_nvm_setup_autoload
if [[ \"\$0\" != _omz_nvm_load ]]; then if [[ \"\$0\" != _omz_nvm_load ]]; then
@ -93,7 +102,7 @@ if zstyle -t ':omz:plugins:nvm' lazy; then
" "
unset nvm_lazy_cmd unset nvm_lazy_cmd
else else
source "$NVM_DIR/nvm.sh" source "$NVM_SOURCE/nvm.sh"
_omz_nvm_setup_completion _omz_nvm_setup_completion
_omz_nvm_setup_autoload _omz_nvm_setup_autoload
fi fi