From d122d7477f14203bb51523de7e87c1400723aaa3 Mon Sep 17 00:00:00 2001 From: Guilherme Rugai Freire Date: Wed, 14 Feb 2024 18:09:37 -0300 Subject: [PATCH] check cargo and nvm/fnm existence before sourcing --- .config/zsh/.zshrc | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 08c9bf7..862ca41 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -8,7 +8,9 @@ export ZSH="$HOME/.local/share/ohmyzsh" source $ZSH/oh-my-zsh.sh # Load cargo env -. "$CARGO_HOME/env" +if [ -d "$CARGO_HOME" ]; then + . "$CARGO_HOME/env" +fi # Set cursor to beam shape echo -ne '\e[5 q' @@ -102,9 +104,13 @@ alias btw="neofetch" # Alias for qrcode alias qrcode="qrencode -s 10 -l H" -# This loads nvm -source $HOME/.config/fast-nvm.sh -source $NVM_DIR/bash_completion +# This loads fnm/nvm +if [ $(command -v fnm) ]; then + eval "$(fnm env --use-on-cd)" +else + source $HOME/.config/fast-nvm.sh + source $NVM_DIR/bash_completion +fi # Check if is integrated terminal emulator if [ "$EMULATOR" = "code" ]; then