Skip to content

Commit

Permalink
implement suggestions for --save option
Browse files Browse the repository at this point in the history
  • Loading branch information
maartin0 committed Aug 30, 2022
1 parent 88d889a commit 1c49ef0
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 13 deletions.
14 changes: 9 additions & 5 deletions nvm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3587,18 +3587,22 @@ nvm() {
local NVMRC_SAVE_TEXT
NVMRC_SAVE_TEXT=''
if [ "${NVM_WRITE_TO_NVMRC}" -eq 1 ] && [ "${VERSION}" != '' ] && [ "${VERSION}" != 'N/A' ]; then
echo "$VERSION" | tee "${PWD}"/.nvmrc > /dev/null || nvm_err "WARNING: Unable write version to .nvmrc"
echo "$VERSION" | tee "${PWD}"/.nvmrc > /dev/null || {
nvm_err "Unable to write version to .nvmrc, aborted."
exit 3
}
NVMRC_SAVE_TEXT=" (saved to .nvmrc)"
fi
if [ "_${VERSION}" = '_system' ]; then
if nvm_has_system_node && nvm deactivate "${NVM_SILENT_ARG-}" >/dev/null 2>&1; then
if [ "${NVM_SILENT:-0}" -ne 1 ]; then
nvm_echo "Now using system version of node: $(node -v 2>/dev/null)$(nvm_print_npm_version)$NVMRC_SAVE_TEXT"
nvm_echo "Now using system version of node:
$(node -v 2>/dev/null)$(nvm_print_npm_version)${NVMRC_SAVE_TEXT}"
fi
return
elif nvm_has_system_iojs && nvm deactivate "${NVM_SILENT_ARG-}" >/dev/null 2>&1; then
if [ "${NVM_SILENT:-0}" -ne 1 ]; then
nvm_echo "Now using system version of io.js: $(iojs --version 2>/dev/null)$(nvm_print_npm_version)"
nvm_echo "Now using system version of io.js: $(iojs --version 2>/dev/null)$(nvm_print_npm_version)${NVMRC_SAVE_TEXT}"
fi
return
elif [ "${NVM_SILENT:-0}" -ne 1 ]; then
Expand Down Expand Up @@ -3647,9 +3651,9 @@ nvm() {
NVM_USE_OUTPUT=''
if [ "${NVM_SILENT:-0}" -ne 1 ]; then
if nvm_is_iojs_version "${VERSION}"; then
NVM_USE_OUTPUT="Now using io.js $(nvm_strip_iojs_prefix "${VERSION}")$(nvm_print_npm_version)"
NVM_USE_OUTPUT="Now using io.js $(nvm_strip_iojs_prefix "${VERSION}")$(nvm_print_npm_version)${NVMRC_SAVE_TEXT}"
else
NVM_USE_OUTPUT="Now using node ${VERSION}$(nvm_print_npm_version)$NVMRC_SAVE_TEXT"
NVM_USE_OUTPUT="Now using node ${VERSION}$(nvm_print_npm_version)${NVMRC_SAVE_TEXT}"
fi
fi
if [ "_${VERSION}" != "_system" ]; then
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

#set -ex
set -ex

clean () {
if [ "$(basename "$(pwd)")" = "tmp" ]; then
Expand All @@ -19,12 +19,12 @@ nvm deactivate >/dev/null 2>&1 || die 'deactivate failed'
test_version () {
clean
VERSION=${1-}
nvm install --save "$VERSION" || die "nvm install --save $VERSION failed"
nvm install --save "$VERSION" || die "\`nvm install --save $VERSION\` failed"
OUTPUT="$(cat .nvmrc)"
EXPECTED_OUTPUT=$(nvm_ls_current)

[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] \
|| die "'nvm use use --save $VERSION' + 'cat .nvmrc' did not output '$EXPECTED_OUTPUT'; got '$OUTPUT'"
|| die "\`nvm use use --save $VERSION\`+ \`cat .nvmrc\` did not output '$EXPECTED_OUTPUT'; got '$OUTPUT'"
}

test_version '--lts'
Expand All @@ -46,13 +46,26 @@ test_version
clean
##

nvm alias 'test' node
nvm use 'test' --save || die 'nvm use test --save failed'
nvm alias test node
nvm use test --save || die "\`nvm use test --save\` failed"
OUTPUT="$(cat .nvmrc)"
EXPECTED_OUTPUT=$(nvm_ls_current)
[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] \
|| die "'nvm use use --save $VERSION' + 'cat .nvmrc' did not output '$EXPECTED_OUTPUT'; got '$OUTPUT'"
nvm unalias 'test'
|| die "\`nvm use use --save $VERSION\` + \`cat .nvmrc\` did not output '$EXPECTED_OUTPUT'; got '$OUTPUT'"
nvm unalias test

##
clean
##

mkdir tmp
cd tmp || die 'Unable to access tmp directory';
chmod 0 .

{
(nvm install --save --lts) &&
die "\`nvm install --save --lts\` did not fail with invalid permissions"
} || echo "\`nvm install --save --lts\` failed successfully"

##
clean
Expand All @@ -62,7 +75,7 @@ OUTPUT="$(nvm use node --silent --save)"
EXPECTED_OUTPUT=''

[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] \
|| die "'nvm use node --silent --save' output was not silenced '$EXPECTED_OUTPUT'; got '$OUTPUT'"
|| die "\`nvm use node --silent --save\` output was not silenced; got '$OUTPUT'"

##

Expand Down

0 comments on commit 1c49ef0

Please sign in to comment.