Skip to content

Commit 853afbf

Browse files
committed
Revert "Revert "[Fix] set -u: ensure that potentially unbound variables aren’t called unchecked.""
This reverts commit a8c4650. Fixes #1363.
1 parent a8c4650 commit 853afbf

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

nvm.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ nvm_remote_versions() {
379379
NVM_LS_REMOTE_PRE_MERGED_OUTPUT=''
380380
local NVM_LS_REMOTE_POST_MERGED_OUTPUT
381381
NVM_LS_REMOTE_POST_MERGED_OUTPUT=''
382-
if [ -z "${NVM_FLAVOR}" ] || [ "${NVM_FLAVOR}" = "${NVM_NODE_PREFIX}" ]; then
382+
if [ -z "${NVM_FLAVOR-}" ] || [ "${NVM_FLAVOR-}" = "${NVM_NODE_PREFIX}" ]; then
383383
local NVM_LS_REMOTE_OUTPUT
384384
NVM_LS_REMOTE_OUTPUT=$(NVM_LTS="${NVM_LTS-}" nvm_ls_remote "${PATTERN-}") &&:
385385
NVM_LS_REMOTE_EXIT_CODE=$?
@@ -391,8 +391,8 @@ nvm_remote_versions() {
391391
local NVM_LS_REMOTE_IOJS_EXIT_CODE
392392
NVM_LS_REMOTE_IOJS_EXIT_CODE=0
393393
local NVM_LS_REMOTE_IOJS_OUTPUT
394-
if [ -z "${NVM_LTS}" ] && ( \
395-
[ -z "${NVM_FLAVOR}" ] || [ "${NVM_FLAVOR}" = "${NVM_IOJS_PREFIX}" ] \
394+
if [ -z "${NVM_LTS-}" ] && ( \
395+
[ -z "${NVM_FLAVOR-}" ] || [ "${NVM_FLAVOR-}" = "${NVM_IOJS_PREFIX}" ] \
396396
); then
397397
NVM_LS_REMOTE_IOJS_OUTPUT=$(nvm_ls_remote_iojs "${PATTERN-}") &&:
398398
NVM_LS_REMOTE_IOJS_EXIT_CODE=$?
@@ -2406,6 +2406,7 @@ nvm() {
24062406
fi
24072407

24082408
local NVM_INSTALL_SUCCESS
2409+
NVM_INSTALL_SUCCESS=false
24092410
if [ -n "${NVM_INSTALL_THIRD_PARTY_HOOK-}" ]; then
24102411
nvm_err '** $NVM_INSTALL_THIRD_PARTY_HOOK env var set; dispatching to third-party installation method **'
24112412
local NVM_METHOD_PREFERENCE

0 commit comments

Comments
 (0)