mirror of
https://github.com/nvm-sh/nvm.git
synced 2025-12-14 17:42:01 +00:00
Compare commits
2 Commits
4f77f044a3
...
travis3
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9f32e7bad4 | ||
|
|
9bd27d3897 |
2
nvm-exec
2
nvm-exec
@@ -1,6 +1,6 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
DIR="$(dirname "$(realpath "${BASH_SOURCE[0]}")")"
|
DIR="$(command cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||||
|
|
||||||
unset NVM_CD_FLAGS
|
unset NVM_CD_FLAGS
|
||||||
|
|
||||||
|
|||||||
23
nvm.sh
23
nvm.sh
@@ -196,9 +196,6 @@ nvm_install_latest_npm() {
|
|||||||
nvm_echo 'Attempting to upgrade to the latest working version of npm...'
|
nvm_echo 'Attempting to upgrade to the latest working version of npm...'
|
||||||
local NODE_VERSION
|
local NODE_VERSION
|
||||||
NODE_VERSION="$(nvm_strip_iojs_prefix "$(nvm_ls_current)")"
|
NODE_VERSION="$(nvm_strip_iojs_prefix "$(nvm_ls_current)")"
|
||||||
local NPM_VERSION
|
|
||||||
NPM_VERSION="$(npm --version 2>/dev/null)"
|
|
||||||
|
|
||||||
if [ "${NODE_VERSION}" = 'system' ]; then
|
if [ "${NODE_VERSION}" = 'system' ]; then
|
||||||
NODE_VERSION="$(node --version)"
|
NODE_VERSION="$(node --version)"
|
||||||
elif [ "${NODE_VERSION}" = 'none' ]; then
|
elif [ "${NODE_VERSION}" = 'none' ]; then
|
||||||
@@ -209,6 +206,8 @@ nvm_install_latest_npm() {
|
|||||||
nvm_err 'Unable to obtain node version.'
|
nvm_err 'Unable to obtain node version.'
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
local NPM_VERSION
|
||||||
|
NPM_VERSION="$(npm --version 2>/dev/null)"
|
||||||
if [ -z "${NPM_VERSION}" ]; then
|
if [ -z "${NPM_VERSION}" ]; then
|
||||||
nvm_err 'Unable to obtain npm version.'
|
nvm_err 'Unable to obtain npm version.'
|
||||||
return 2
|
return 2
|
||||||
@@ -701,12 +700,10 @@ nvm_ensure_version_installed() {
|
|||||||
nvm_err "N/A: version \"${PREFIXED_VERSION:-$PROVIDED_VERSION}\" is not yet installed."
|
nvm_err "N/A: version \"${PREFIXED_VERSION:-$PROVIDED_VERSION}\" is not yet installed."
|
||||||
fi
|
fi
|
||||||
nvm_err ""
|
nvm_err ""
|
||||||
if [ "${PROVIDED_VERSION}" = 'lts' ]; then
|
if [ "${IS_VERSION_FROM_NVMRC}" != '1' ]; then
|
||||||
nvm_err '`lts` is not an alias - you may need to run `nvm install --lts` to install and `nvm use --lts` to use it.'
|
nvm_err "You need to run \`nvm install ${PROVIDED_VERSION}\` to install and use it."
|
||||||
elif [ "${IS_VERSION_FROM_NVMRC}" != '1' ]; then
|
else
|
||||||
nvm_err "You need to run \`nvm install ${PROVIDED_VERSION}\` to install and use it."
|
nvm_err 'You need to run `nvm install` to install and use the node version specified in `.nvmrc`.'
|
||||||
else
|
|
||||||
nvm_err 'You need to run `nvm install` to install and use the node version specified in `.nvmrc`.'
|
|
||||||
fi
|
fi
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
@@ -4054,14 +4051,8 @@ nvm() {
|
|||||||
nvm_echo "Running node ${VERSION}$(nvm use --silent "${VERSION}" && nvm_print_npm_version)"
|
nvm_echo "Running node ${VERSION}$(nvm use --silent "${VERSION}" && nvm_print_npm_version)"
|
||||||
fi
|
fi
|
||||||
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")
|
"ls" | "list")
|
||||||
local PATTERN
|
local PATTERN
|
||||||
local NVM_NO_COLORS
|
local NVM_NO_COLORS
|
||||||
|
|||||||
@@ -1,18 +0,0 @@
|
|||||||
#!/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"
|
|
||||||
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
set -ex
|
|
||||||
|
|
||||||
die () { echo "$@" ; exit 1; }
|
|
||||||
|
|
||||||
\. ../../../nvm.sh
|
|
||||||
|
|
||||||
# Deactivate any active node version
|
|
||||||
nvm deactivate >/dev/null 2>&1 || die 'deactivate failed'
|
|
||||||
|
|
||||||
# Attempt to use 'lts' without '--' and capture the error message
|
|
||||||
ERROR_OUTPUT=$(nvm use lts 2>&1) || true
|
|
||||||
|
|
||||||
EXPECTED_ERROR='`lts` is not an alias - you may need to run `nvm install --lts` to install and `nvm use --lts` to use it.'
|
|
||||||
|
|
||||||
# Check if the error message matches the expected output
|
|
||||||
echo "$ERROR_OUTPUT" | grep -q "$EXPECTED_ERROR" \
|
|
||||||
|| die "Expected error message not found. Got: $ERROR_OUTPUT"
|
|
||||||
Reference in New Issue
Block a user