peterwood/shell
1
0
Fork 0
mirror of https://github.com/acedanger/shell.git synced 2025-12-06 04:30:13 -08:00
Code Issues 19 Packages Projects Releases Wiki Activity

fix: Ensure nvm loading only occurs if nvm is available

Browse Source
This commit is contained in:
Peter Wood
2025-11-29 10:05:55 -05:00
parent 645d10d548
commit 1287168961
1 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
dotfiles/.zshrc
View File

@@ -100,22 +100,25 @@ export NVM_DIR="$HOME/.nvm"
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion
# Automatically use node version specified in .nvmrc if present # Automatically use node version specified in .nvmrc if present
autoload -U add-zsh-hook # Only enable if nvm is loaded
load-nvmrc() { if command -v nvm_find_nvmrc > /dev/null 2>&1; then
local nvmrc_path="$(nvm_find_nvmrc)" autoload -U add-zsh-hook
if [ -n "$nvmrc_path" ]; then load-nvmrc() {
local nvmrc_node_version=$(nvm version "$(cat "${nvmrc_path}")") local nvmrc_path="$(nvm_find_nvmrc)"
if [ "$nvmrc_node_version" = "N/A" ]; then if [ -n "$nvmrc_path" ]; then
nvm install local nvmrc_node_version=$(nvm version "$(cat "${nvmrc_path}")")
elif [ "$nvmrc_node_version" != "$(nvm version)" ]; then if [ "$nvmrc_node_version" = "N/A" ]; then
nvm use nvm install
elif [ "$nvmrc_node_version" != "$(nvm version)" ]; then
nvm use
fi
elif [ -n "$(PWD=$OLDPWD nvm_find_nvmrc)" ] && [ "$(nvm version)" != "$(nvm version default)" ]; then
nvm use default
fi fi
elif [ -n "$(PWD=$OLDPWD nvm_find_nvmrc)" ] && [ "$(nvm version)" != "$(nvm version default)" ]; then }
nvm use default add-zsh-hook chpwd load-nvmrc
fi load-nvmrc
} fi
add-zsh-hook chpwd load-nvmrc
load-nvmrc
[[ -s $HOME/.autojump/etc/profile.d/autojump.sh ]] && source $HOME/.autojump/etc/profile.d/autojump.sh [[ -s $HOME/.autojump/etc/profile.d/autojump.sh ]] && source $HOME/.autojump/etc/profile.d/autojump.sh