diff --git a/files/home/.profile b/files/home/.profile index ed2a5e8..70c5c6b 100644 --- a/files/home/.profile +++ b/files/home/.profile @@ -23,10 +23,8 @@ export DOTFILES=${DOTFILES:-"$HOME/.dotfiles"} # Initialise and load Node # ----------------------------------------------------------------- -if [ -z "$NVM_DIR" ]; then - export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")" - mkdir -p "$NVM_DIR" -fi +export NVM_DIR=${NVM_DIR:-"$HOME/.nvm"} +mkdir -p "$NVM_DIR" _dots_load_nvm() { [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" --no-use diff --git a/script/install.d/12-node.sh b/script/install.d/12-node.sh index 0aedaf9..296bbb7 100644 --- a/script/install.d/12-node.sh +++ b/script/install.d/12-node.sh @@ -5,7 +5,7 @@ # Configure Node.js. # -NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")" +NVM_DIR=${NVM_DIR:-"$HOME/.nvm"} [ -s "$NVM_DIR/nvm.sh" ] && source "$NVM_DIR/nvm.sh" nvm_version="0.40.3"