Merge c74c74eb0a9f2a11015a00ce1551a290797b11dc into 762f9ef9d17623b45095e8ca1a996c8928f3f424

[Tests] only install python 2.7 if not already installed
See ee6f7667 / #3067
2025-08-16 10:43:42 +00:00 · 2024-07-07 21:10:57 +09:00 · 2024-07-06 10:29:55 -05:00 · 2023-03-10 15:43:33 -06:00 · 2023-03-10 15:33:15 -06:00 · 2023-03-10 12:27:55 -06:00
4 changed files with 27 additions and 3 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -32,7 +32,7 @@ before_install:
  - zsh  --version
  - dpkg -s dash | grep ^Version | awk '{print $2}'
  # install python
-  - pyenv install 2.7.18
+  - pyenv local 2.7.18 || pyenv install 2.7.18
  - pyenv local 2.7.18 || echo 'pyenv failed'
  - python -V
 install:
--- a/2
+++ b/2
@ -1,6 +1,6 @@
 #!/usr/bin/env bash

-DIR="$(command cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+DIR="$(dirname "$(realpath "${BASH_SOURCE[0]}")")"

 unset NVM_CD_FLAGS

--- a/nvm.sh
+++ b/nvm.sh
@ -3958,8 +3958,14 @@ nvm() {
          nvm_echo "Running node ${VERSION}$(nvm use --silent "${VERSION}" && nvm_print_npm_version)"
        fi
      fi
-      NODE_VERSION="${VERSION}" "${NVM_DIR}/nvm-exec" "$@"
+
+      NVM_EXEC="${NVM_DIR}/nvm-exec"
+      if [ ! -f "${NVM_EXEC}" ]; then
+        NVM_EXEC="$(dirname "${BASH_SOURCE[0]-}")/nvm-exec"
+      fi
+      NODE_VERSION="${VERSION}" "${NVM_EXEC}" "$@"
    ;;
+
    "ls" | "list")
      local PATTERN
      local NVM_NO_COLORS
--- a/test/slow/nvm
+++ b/test/slow/nvm
@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -ex
+
+die () { echo "$@" ; exit 1; }
+
+INSTPATH="$(mktemp -p "$(pwd)" -d)"
+trap 'test ! -z "${INSTPATH-}" && test -d "$INSTPATH" && rm -rf "$INSTPATH"' EXIT
+declare -x NVM_DIR=$INSTPATH
+\. ../../../nvm.sh
+
+nvm install --lts || die 'nvm install --lts failed'
+nvm exec --lts npm --version || die "`nvm exec` failed to run"
+declare -x NODE_VERSION="$(nvm exec --lts --silent node --version)"
+
+ln -s ../../../../nvm-exec "$INSTPATH/nvm-exec" || die "failed to create a symlink to $INSTPATH/"
+"$INSTPATH/nvm-exec" npm ls > /dev/null || die "`nvm exec` failed to run using nvm-exec helper"
+
Author	SHA1	Message	Date
Chris Hall	3fe2dde611	Merge c74c74eb0a9f2a11015a00ce1551a290797b11dc into 762f9ef9d17623b45095e8ca1a996c8928f3f424	2024-07-07 21:10:57 +09:00
Jordan Harband	762f9ef9d1	[Tests] only install python 2.7 if not already installed See ee6f7667 / #3067	2024-07-06 10:29:55 -05:00
Matt Saladna	c74c74eb0a	Add test for NVM_DIR outside nvm.sh	2023-03-10 15:43:33 -06:00
Matt Saladna	9dc29fd8eb	shellcheck warnings	2023-03-10 15:33:15 -06:00
Matt Saladna	d7058a4952	Allow nvm-exec to be linked into individual .nvm directories for system-wide installs with a localized Nodes. Let's say we have nvm installed in a separate mount, /.socket. NVM_DIR is $HOME/.nvm in /etc/profile.d/nvm.sh. With this setup, users can install Node versions to their home directories without each installing nvm. nvm install --lts This works fine as does nvm use --lts. When nvm exec is used though, it fails because it looks for nvm-exec in $NVM_DIR. First fix is to look for nvm-exec in $NVM_DIR. If NVM_DIR does not contain nvm-exec, check $BASH_SOURCE[0]. The second fix is to follow nvm-exec if a symbolic link to determine the proper location of nvm's home. Alternatively we could use a second environment variable, NVM_HOME in exec instead of relying on the directory name of nvm-exec.	2023-03-10 12:27:55 -06:00