@@ -68,13 +68,16 @@ nvm_print_npm_version() {
68
68
69
69
# Make zsh glob matching behave same as bash
70
70
# This fixes the "zsh: no matches found" errors
71
+ if [ -z " ${NVM_CD_FLAGS-} " ]; then
72
+ export NVM_CD_FLAGS=' '
73
+ fi
71
74
if nvm_has " unsetopt" ; then
72
75
unsetopt nomatch 2> /dev/null
73
76
NVM_CD_FLAGS=" -q"
74
77
fi
75
78
76
79
# Auto detect the NVM_DIR when not set
77
- if [ -z " $NVM_DIR " ]; then
80
+ if [ -z " ${ NVM_DIR-} " ]; then
78
81
if [ -n " $BASH_SOURCE " ]; then
79
82
NVM_SCRIPT_SOURCE=" ${BASH_SOURCE[0]} "
80
83
fi
@@ -85,7 +88,7 @@ unset NVM_SCRIPT_SOURCE 2> /dev/null
85
88
86
89
87
90
# Setup mirror location if not already set
88
- if [ -z " $NVM_NODEJS_ORG_MIRROR " ]; then
91
+ if [ -z " ${ NVM_NODEJS_ORG_MIRROR-} " ]; then
89
92
export NVM_NODEJS_ORG_MIRROR=" https://nodejs.org/dist"
90
93
fi
91
94
@@ -529,7 +532,7 @@ nvm_strip_iojs_prefix() {
529
532
530
533
nvm_ls () {
531
534
local PATTERN
532
- PATTERN=" $1 "
535
+ PATTERN=" ${1-} "
533
536
local VERSIONS
534
537
VERSIONS=' '
535
538
if [ " $PATTERN " = ' current' ]; then
@@ -659,7 +662,7 @@ nvm_ls() {
659
662
fi
660
663
fi
661
664
662
- if [ " $NVM_ADD_SYSTEM " = true ]; then
665
+ if [ " ${ NVM_ADD_SYSTEM-} " = true ]; then
663
666
if [ -z " $PATTERN " ] || [ " _$PATTERN " = " _v" ]; then
664
667
VERSIONS=" $VERSIONS $( command printf ' \n%s' ' system' ) "
665
668
elif [ " $PATTERN " = ' system' ]; then
@@ -700,6 +703,7 @@ nvm_ls_remote_index_tab() {
700
703
local TYPE
701
704
TYPE=" $1 "
702
705
local PREFIX
706
+ PREFIX=' '
703
707
case " $TYPE -$2 " in
704
708
iojs-std) PREFIX=" $( nvm_iojs_prefix) -" ;;
705
709
node-std) PREFIX=' ' ;;
@@ -835,7 +839,7 @@ nvm_print_implicit_alias() {
835
839
local NVM_ADD_PREFIX_COMMAND
836
840
local LAST_TWO
837
841
case " $NVM_IMPLICIT " in
838
- " $NVM_IOJS_PREFIX " | " $NVM_IOJS_RC_PREFIX " )
842
+ " $NVM_IOJS_PREFIX " )
839
843
NVM_COMMAND=" nvm_ls_remote_iojs"
840
844
NVM_ADD_PREFIX_COMMAND=" nvm_add_iojs_prefix"
841
845
if [ " _$1 " = " _local" ]; then
@@ -1146,7 +1150,7 @@ nvm_install_node_binary() {
1146
1150
local REINSTALL_PACKAGES_FROM
1147
1151
REINSTALL_PACKAGES_FROM=" $2 "
1148
1152
1149
- if nvm_is_iojs_version " $PREFIXED_VERSION " ; then
1153
+ if nvm_is_iojs_version " $VERSION " ; then
1150
1154
echo ' nvm_install_node_binary does not allow an iojs-prefixed version.' >&2
1151
1155
return 10
1152
1156
fi
@@ -1201,11 +1205,11 @@ nvm_install_node_binary() {
1201
1205
}
1202
1206
1203
1207
nvm_get_make_jobs () {
1204
- if nvm_is_natural_num " $1 " ; then
1208
+ if nvm_is_natural_num " ${1-} " ; then
1205
1209
NVM_MAKE_JOBS=" $1 "
1206
1210
echo " number of \` make\` jobs: $NVM_MAKE_JOBS "
1207
1211
return
1208
- elif [ -n " $1 " ]; then
1212
+ elif [ -n " ${1-} " ]; then
1209
1213
unset NVM_MAKE_JOBS
1210
1214
echo >&2 " $1 is invalid for number of \` make\` jobs, must be a natural number"
1211
1215
fi
@@ -1290,9 +1294,9 @@ nvm_install_node_source() {
1290
1294
command tar -xzf " $tmptarball " -C " $tmpdir " && \
1291
1295
cd " $tmpdir /node-$VERSION " && \
1292
1296
./configure --prefix=" $VERSION_PATH " $ADDITIONAL_PARAMETERS && \
1293
- $make -j $NVM_MAKE_JOBS $MAKE_CXX && \
1297
+ $make -j $NVM_MAKE_JOBS ${ MAKE_CXX-} && \
1294
1298
command rm -f " $VERSION_PATH " 2> /dev/null && \
1295
- $make -j $NVM_MAKE_JOBS $MAKE_CXX install
1299
+ $make -j $NVM_MAKE_JOBS ${ MAKE_CXX-} install
1296
1300
)
1297
1301
then
1298
1302
if ! nvm_has " npm" ; then
@@ -1371,14 +1375,14 @@ nvm_die_on_prefix() {
1371
1375
return 2
1372
1376
fi
1373
1377
1374
- if [ -n " $PREFIX " ] && ! (nvm_tree_contains_path " $NVM_DIR " " $PREFIX " > /dev/null 2>&1 ); then
1378
+ if [ -n " ${ PREFIX-} " ] && ! (nvm_tree_contains_path " $NVM_DIR " " $PREFIX " > /dev/null 2>&1 ); then
1375
1379
nvm deactivate > /dev/null 2>&1
1376
1380
echo >&2 " nvm is not compatible with the \" PREFIX\" environment variable: currently set to \" $PREFIX \" "
1377
1381
echo >&2 " Run \` unset PREFIX\` to unset it."
1378
1382
return 3
1379
1383
fi
1380
1384
1381
- if [ -n " $NPM_CONFIG_PREFIX " ] && ! (nvm_tree_contains_path " $NVM_DIR " " $NPM_CONFIG_PREFIX " > /dev/null 2>&1 ); then
1385
+ if [ -n " ${ NPM_CONFIG_PREFIX-} " ] && ! (nvm_tree_contains_path " $NVM_DIR " " $NPM_CONFIG_PREFIX " > /dev/null 2>&1 ); then
1382
1386
nvm deactivate > /dev/null 2>&1
1383
1387
echo >&2 " nvm is not compatible with the \" NPM_CONFIG_PREFIX\" environment variable: currently set to \" $NPM_CONFIG_PREFIX \" "
1384
1388
echo >&2 " Run \` unset NPM_CONFIG_PREFIX\` to unset it."
@@ -1702,6 +1706,9 @@ nvm() {
1702
1706
fi
1703
1707
fi
1704
1708
if [ " $NVM_INSTALL_SUCCESS " != true ]; then
1709
+ if [ -z " ${NVM_MAKE_JOBS-} " ]; then
1710
+ nvm_get_make_jobs
1711
+ fi
1705
1712
if [ " $NVM_IOJS " != true ] && [ " $NVM_NODE_MERGED " != true ]; then
1706
1713
if nvm_install_node_source " $VERSION " " $NVM_MAKE_JOBS " " $ADDITIONAL_PARAMETERS " ; then
1707
1714
NVM_INSTALL_SUCCESS=true
@@ -1794,18 +1801,22 @@ nvm() {
1794
1801
echo " $NVM_DIR /*/bin removed from \$ PATH"
1795
1802
fi
1796
1803
1797
- NEWPATH=" $( nvm_strip_path " $MANPATH " " /share/man" ) "
1798
- if [ " _$MANPATH " = " _$NEWPATH " ]; then
1799
- echo " Could not find $NVM_DIR /*/share/man in \$ MANPATH" >&2
1800
- else
1801
- export MANPATH=" $NEWPATH "
1802
- echo " $NVM_DIR /*/share/man removed from \$ MANPATH"
1804
+ if [ -n " ${MANPATH-} " ]; then
1805
+ NEWPATH=" $( nvm_strip_path " $MANPATH " " /share/man" ) "
1806
+ if [ " _$MANPATH " = " _$NEWPATH " ]; then
1807
+ echo " Could not find $NVM_DIR /*/share/man in \$ MANPATH" >&2
1808
+ else
1809
+ export MANPATH=" $NEWPATH "
1810
+ echo " $NVM_DIR /*/share/man removed from \$ MANPATH"
1811
+ fi
1803
1812
fi
1804
1813
1805
- NEWPATH=" $( nvm_strip_path " $NODE_PATH " " /lib/node_modules" ) "
1806
- if [ " _$NODE_PATH " != " _$NEWPATH " ]; then
1807
- export NODE_PATH=" $NEWPATH "
1808
- echo " $NVM_DIR /*/lib/node_modules removed from \$ NODE_PATH"
1814
+ if [ -n " ${NODE_PATH-} " ]; then
1815
+ NEWPATH=" $( nvm_strip_path " $NODE_PATH " " /lib/node_modules" ) "
1816
+ if [ " _$NODE_PATH " != " _$NEWPATH " ]; then
1817
+ export NODE_PATH=" $NEWPATH "
1818
+ echo " $NVM_DIR /*/lib/node_modules removed from \$ NODE_PATH"
1819
+ fi
1809
1820
fi
1810
1821
;;
1811
1822
" use" )
@@ -1898,7 +1909,7 @@ nvm() {
1898
1909
hash -r
1899
1910
export NVM_PATH=" $NVM_VERSION_DIR /lib/node"
1900
1911
export NVM_BIN=" $NVM_VERSION_DIR /bin"
1901
- if [ " $NVM_SYMLINK_CURRENT " = true ]; then
1912
+ if [ " ${ NVM_SYMLINK_CURRENT-} " = true ]; then
1902
1913
command rm -f " $NVM_DIR /current" && ln -s " $NVM_VERSION_DIR " " $NVM_DIR /current"
1903
1914
fi
1904
1915
local NVM_USE_OUTPUT
@@ -2057,7 +2068,7 @@ nvm() {
2057
2068
" ls" | " list" )
2058
2069
local NVM_LS_OUTPUT
2059
2070
local NVM_LS_EXIT_CODE
2060
- NVM_LS_OUTPUT=$( nvm_ls " $2 " )
2071
+ NVM_LS_OUTPUT=$( nvm_ls " ${2-} " )
2061
2072
NVM_LS_EXIT_CODE=$?
2062
2073
nvm_print_versions " $NVM_LS_OUTPUT "
2063
2074
if [ $# -eq 1 ]; then
@@ -2067,7 +2078,7 @@ nvm() {
2067
2078
;;
2068
2079
" ls-remote" | " list-remote" )
2069
2080
local PATTERN
2070
- PATTERN=" $2 "
2081
+ PATTERN=" ${2-} "
2071
2082
local NVM_IOJS_PREFIX
2072
2083
NVM_IOJS_PREFIX=" $( nvm_iojs_prefix) "
2073
2084
local NVM_NODE_PREFIX
@@ -2172,7 +2183,7 @@ $NVM_LS_REMOTE_POST_MERGED_OUTPUT" | command grep -v "N/A" | command sed '/^$/d'
2172
2183
command mkdir -p " $NVM_ALIAS_DIR "
2173
2184
if [ $# -le 2 ]; then
2174
2185
local DEST
2175
- for ALIAS_PATH in " $NVM_ALIAS_DIR " /" $2 " * ; do
2186
+ for ALIAS_PATH in " $NVM_ALIAS_DIR " /" ${2-} " * ; do
2176
2187
ALIAS=" $( command basename " $ALIAS_PATH " ) "
2177
2188
DEST=" $( nvm_alias " $ALIAS " 2> /dev/null) "
2178
2189
if [ -n " $DEST " ]; then
@@ -2202,7 +2213,7 @@ $NVM_LS_REMOTE_POST_MERGED_OUTPUT" | command grep -v "N/A" | command sed '/^$/d'
2202
2213
done
2203
2214
return
2204
2215
fi
2205
- if [ -z " $3 " ]; then
2216
+ if [ -z " ${3-} " ]; then
2206
2217
command rm -f " $NVM_ALIAS_DIR /$2 "
2207
2218
echo " $2 -> *poof*"
2208
2219
return
0 commit comments