diff --git a/CHANGELOG.md b/CHANGELOG.md index 4241b4c..6cf5b95 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # CHANGELOG +## 1.1.2 + +This is a bugfix release. `_urdabash_version_check` would incorrectly report `nvm` loaded status. + +- `bashrc` + - Only set `URDABASH_LOADED_NVM` if `nvm`. + - Only export `NVM_DIR` if `nvm` is actually loaded. + ## 1.1.1 This is a bugfix release. `_urdabash_version_check` would fail on some Linux instances. diff --git a/VERSION b/VERSION index 524cb55..45a1b3f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.1.1 +1.1.2 diff --git a/bashrc b/bashrc index 3246fd1..eb718b8 100644 --- a/bashrc +++ b/bashrc @@ -31,7 +31,7 @@ fi ################################################################################ if [[ -z ${URDABASH_VERSION+x} ]]; then - readonly URDABASH_VERSION="1.1.1" + readonly URDABASH_VERSION="1.1.2" export URDABASH_VERSION fi @@ -188,16 +188,20 @@ fi # NVM (via ~/.nvm or Homebrew) # ------------------------------ if [[ -z ${URDABASH_LOADED_NVM+x} ]]; then - readonly URDABASH_LOADED_NVM=1 - export NVM_DIR="${HOME}/.nvm" command -v brew >/dev/null 2>&1 && nvm_brew_prefix="$(brew --prefix nvm 2>/dev/null)" if [ -s "${HOME}/.nvm/nvm.sh" ]; then + readonly URDABASH_LOADED_NVM=1 + export NVM_DIR="${HOME}/.nvm" _source_if_exists "${NVM_DIR}/nvm.sh" _source_if_exists "${NVM_DIR}/bash_completion" elif [ -n "${nvm_brew_prefix}" ] && [ -f "${nvm_brew_prefix}/nvm.sh" ]; then + readonly URDABASH_LOADED_NVM=1 + export NVM_DIR="${HOME}/.nvm" _source_if_exists "${nvm_brew_prefix}/nvm.sh" _source_if_exists "${nvm_brew_prefix}/etc/bash_completion.d/nvm" + else + readonly URDABASH_LOADED_NVM=0 fi unset nvm_brew_prefix