Merge 839c497d29 into 1ba8a96ec9
This commit is contained in:
commit
99895c963a
|
|
@ -6,7 +6,7 @@ nvm_has() {
|
||||||
type "$1" > /dev/null 2>&1
|
type "$1" > /dev/null 2>&1
|
||||||
}
|
}
|
||||||
|
|
||||||
if [ -z "$NVM_DIR" ]; then
|
if [ -z "$NVM_DIR" ] || [[ -n $(uname -a | grep Ubuntu) ]]; then
|
||||||
NVM_DIR="$HOME/.nvm"
|
NVM_DIR="$HOME/.nvm"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
||||||
2
nvm.sh
2
nvm.sh
|
|
@ -74,7 +74,7 @@ if nvm_has "unsetopt"; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Auto detect the NVM_DIR when not set
|
# Auto detect the NVM_DIR when not set
|
||||||
if [ -z "$NVM_DIR" ]; then
|
if [ -z "$NVM_DIR" ] || [[ -n $(uname -a | grep Ubuntu) ]]; then
|
||||||
if [ -n "$BASH_SOURCE" ]; then
|
if [ -n "$BASH_SOURCE" ]; then
|
||||||
NVM_SCRIPT_SOURCE="${BASH_SOURCE[0]}"
|
NVM_SCRIPT_SOURCE="${BASH_SOURCE[0]}"
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue