From 1d06f3a2d82addc00a8bb7ed871a15318514ba1f Mon Sep 17 00:00:00 2001 From: John D Pell Date: Wed, 23 Feb 2022 15:40:44 -0800 Subject: [PATCH] =?UTF-8?q?plugin/node.js:=20don=E2=80=99t=20overwrite=20N?= =?UTF-8?q?*=5FROOT=20variables?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Alsö, no need to check if directory exists before calling `pathmunge` as it already does so. --- plugins/available/nenv.plugin.bash | 7 +++---- plugins/available/nodenv.plugin.bash | 7 +++---- plugins/available/nvm.plugin.bash | 3 ++- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/plugins/available/nenv.plugin.bash b/plugins/available/nenv.plugin.bash index 9ec0c32fc9..a9937b740c 100644 --- a/plugins/available/nenv.plugin.bash +++ b/plugins/available/nenv.plugin.bash @@ -4,11 +4,10 @@ about-plugin 'Node.js environment management using https://github.com/ryuone/nen # Load after basher # BASH_IT_LOAD_PRIORITY: 260 -export NENV_ROOT="${NENV_ROOT:-${HOME?}/.nenv}" +: "${NENV_ROOT:=${HOME?}/.nenv}" +export NENV_ROOT -if [[ -d "${NENV_ROOT?}/bin" ]]; then - pathmunge "${NENV_ROOT?}/bin" -fi +pathmunge "${NENV_ROOT?}/bin" if _command_exists nenv; then eval "$(nenv init - bash)" diff --git a/plugins/available/nodenv.plugin.bash b/plugins/available/nodenv.plugin.bash index 729ab96347..936c476e2c 100644 --- a/plugins/available/nodenv.plugin.bash +++ b/plugins/available/nodenv.plugin.bash @@ -4,11 +4,10 @@ about-plugin 'Node.js environment management using https://github.com/nodenv/nod # Load after basher # BASH_IT_LOAD_PRIORITY: 260 -export NODENV_ROOT="${NODENV_ROOT:-${HOME?}/.nodenv}" +: "${NODENV_ROOT:=${HOME?}/.nodenv}" +export NODENV_ROOT -if [[ -d "${NODENV_ROOT?}/bin" ]]; then - pathmunge "${NODENV_ROOT?}/bin" -fi +pathmunge "${NODENV_ROOT?}/bin" if _command_exists nodenv; then eval "$(nodenv init - bash)" diff --git a/plugins/available/nvm.plugin.bash b/plugins/available/nvm.plugin.bash index 1280a5bb23..4b7cc1ad6a 100644 --- a/plugins/available/nvm.plugin.bash +++ b/plugins/available/nvm.plugin.bash @@ -4,7 +4,8 @@ about-plugin 'Node.js version manager, https://github.com/nvm-sh/nvm' # Load after basher # BASH_IT_LOAD_PRIORITY: 260 -export NVM_DIR="${NVM_DIR:-${HOME?}/.nvm}" +: "${NVM_DIR:=${HOME?}/.nvm}" +export NVM_DIR if _bash_it_homebrew_check && [[ -s "${BASH_IT_HOMEBREW_PREFIX?}/nvm.sh" ]]; then source "${BASH_IT_HOMEBREW_PREFIX?}/nvm.sh"