Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.1.1
1.1.2
10 changes: 7 additions & 3 deletions bashrc
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down