Merge 839c497d29 into 1ba8a96ec9

2016-01-04 16:14:40 +00:00 · 2016-01-04 16:14:40 +00:00 · 99895c963a
parent 1ba8a96ec9 839c497d29
commit 99895c963a
2 changed files with 2 additions and 2 deletions
--- a/install.sh
+++ b/install.sh
@ -6,7 +6,7 @@ nvm_has() {
  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"
 fi

--- a/nvm.sh
+++ b/nvm.sh
@ -74,7 +74,7 @@ if nvm_has "unsetopt"; then
 fi

 # 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
    NVM_SCRIPT_SOURCE="${BASH_SOURCE[0]}"
  fi