Merge c04530396e into 759f70f196

nvm.sh

@@ -136,15 +136,17 @@ nvm_download() {
     eval "curl -q --fail ${CURL_COMPRESSED_FLAG:-} ${CURL_HEADER_FLAG:-} ${NVM_DOWNLOAD_ARGS}"
   elif nvm_has "wget"; then
     # Emulate curl with wget
-    ARGS=$(nvm_echo "$@" | command sed -e 's/--progress-bar /--progress=bar /' \
-                            -e 's/--compressed //' \
-                            -e 's/--fail //' \
-                            -e 's/-L //' \
-                            -e 's/-I /--server-response /' \
-                            -e 's/-s /-q /' \
-                            -e 's/-sS /-nv /' \
-                            -e 's/-o /-O /' \
-                            -e 's/-C - /-c /')
+    ARGS=$(nvm_echo "$@" | command sed "
+      s/--progress-bar /--progress=bar /
+      s/--compressed //
+      s/--fail //
+      s/-L //
+      s/-I /--server-response /
+      s/-s /-q /
+      s/-sS /-nv /
+      s/-o /-O /
+      s/-C - /-c /
+    ")
 
     if [ -n "${NVM_AUTH_HEADER:-}" ]; then
       ARGS="${ARGS} --header \"${NVM_AUTH_HEADER}\""
@@ -1413,11 +1415,11 @@ nvm_add_iojs_prefix() {
 nvm_strip_iojs_prefix() {
   local NVM_IOJS_PREFIX
   NVM_IOJS_PREFIX="$(nvm_iojs_prefix)"
-  if [ "${1-}" = "${NVM_IOJS_PREFIX}" ]; then
-    nvm_echo
-  else
-    nvm_echo "${1#"${NVM_IOJS_PREFIX}"-}"
-  fi
+
+  case "${1-}" in
+    "${NVM_IOJS_PREFIX}") nvm_echo ;;
+    *) nvm_echo "${1#"${NVM_IOJS_PREFIX}"-}" ;;
+  esac
 }
 
 nvm_ls() {
@@ -1549,12 +1551,15 @@ nvm_ls() {
   fi
 
   if [ "${NVM_ADD_SYSTEM-}" = true ]; then
-    if [ -z "${PATTERN}" ] || [ "${PATTERN}" = 'v' ]; then
-      VERSIONS="${VERSIONS}
+    case "${PATTERN}" in
+      '' | v)
+        VERSIONS="${VERSIONS}
 system"
-    elif [ "${PATTERN}" = 'system' ]; then
-      VERSIONS="system"
-    fi
+      ;;
+      system)
+        VERSIONS="system"
+      ;;
+    esac
   fi
 
   if [ -z "${VERSIONS}" ]; then
@@ -1688,7 +1693,7 @@ EOF
     LTS="${LTS#lts/}"
   fi
 
-  VERSIONS="$({ command awk -v lts="${LTS-}" '{
+  VERSIONS="$( { command awk -v lts="${LTS-}" '{
         if (!$1) { next }
         if (lts && $10 ~ /^\-?$/) { next }
         if (lts && lts != "*" && tolower($10) !~ tolower(lts)) { next }
@@ -2732,7 +2737,7 @@ nvm_npm_global_modules() {
   local NPMLIST
   local VERSION
   VERSION="$1"
-  NPMLIST=$(nvm use "${VERSION}" >/dev/null && npm list -g --depth=0 2>/dev/null | command sed 1,1d | nvm_grep -v 'UNMET PEER DEPENDENCY')
+  NPMLIST=$(nvm use "${VERSION}" >/dev/null && npm list -g --depth=0 2>/dev/null | command sed -e '1d' -e '/UNMET PEER DEPENDENCY/d')
 
   local INSTALLS
   INSTALLS=$(nvm_echo "${NPMLIST}" | command sed -e '/ -> / d' -e '/\(empty\)/ d' -e 's/^.* \(.*@[^ ]*\).*/\1/' -e '/^npm@[^ ]*.*$/ d' | command xargs)

test/install_script/nvm_check_if_path_exists

@@ -0,0 +1,41 @@
+#!/bin/sh
+
+setup () {
+  HOME="."
+  NVM_ENV=testing \. ../../install.sh
+  touch ".bashrc"
+  touch ".zshrc"
+  touch ".profile"
+}
+
+cleanup () {
+  unset HOME
+  unset NVM_ENV
+  unset NVM_DETECT_PROFILE
+  unset BASH_VERSION
+  unset ZSH_VERSION
+  unset -f setup cleanup die
+  rm -f ".bashrc" ".bash_profile" ".zshrc" ".profile" "test_profile" > "/dev/null" 2>&1
+}
+
+die () { echo "$@" '$NVM_DETECT_PROFILE:' "$NVM_DETECT_PROFILE"; cleanup; exit 1; }
+
+setup
+
+# check if nvm_path already exists in bashrc
+NVM_DETECT_PROFILE="$(BASH_VERSION="1"; unset PROFILE; nvm_detect_profile)"
+echo "export NVM_DIR="$HOME/.nvm"" > $HOME/.bashrc
+OUTPUT = "$(nvm_do_install)"
+EXPECTED_OUTPUT='nvm source string already in ${NVM_PROFILE}'
+if [ "${OUTPUT#*$EXPECTED_OUTPUT}" = "${OUTPUT}" ]; then
+  die "Path already exists in the profile, so should have returned >${EXPECTED_OUTPUT}<. Instead it returned >${OUTPUT}<"
+fi
+
+# .zshrc should be detected for zsh
+NVM_DETECT_PROFILE="$(ZSH_VERSION="1"; unset PROFILE; unset BASH_VERSION; nvm_detect_profile)"
+echo "export NVM_DIR="$HOME/.nvm"" > $HOME/.zshrc
+OUTPUT = "$(nvm_do_install)"
+EXPECTED_OUTPUT='nvm source string already in ${NVM_PROFILE}'
+if [ "${OUTPUT#*$EXPECTED_OUTPUT}" = "${OUTPUT}" ]; then
+  die "Path already exists in the profile, so should have returned >${EXPECTED_OUTPUT}<. Instead it returned >${OUTPUT}<"
+fi