eeymoo/nvm
1
0
Fork 0
mirror of https://github.com/nvm-sh/nvm.git synced 2025-10-31 18:25:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tweaking local variable name to avoid pollution under ksh.

Browse Source
This commit is contained in:
Jordan Harband
2015-07-18 09:31:07 -07:00
parent 60c2f3705e
commit 759f86f946
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
nvm.sh
View File

@@ -1445,10 +1445,10 @@ nvm() {
;; ;;
"use" ) "use" )
local PROVIDED_VERSION local PROVIDED_VERSION
local silent local NVM_USE_SILENT
silent=0 NVM_USE_SILENT=0
if [ "$2" = '--silent' ]; then if [ "$2" = '--silent' ]; then
silent=1 NVM_USE_SILENT=1
shift shift
fi fi
@@ -1470,23 +1470,23 @@ nvm() {
if [ "_$VERSION" = '_system' ]; then if [ "_$VERSION" = '_system' ]; then
if nvm_has_system_node && nvm deactivate >/dev/null 2>&1; then if nvm_has_system_node && nvm deactivate >/dev/null 2>&1; then
if [ $silent -ne 1 ]; then if [ $NVM_USE_SILENT -ne 1 ]; then
echo "Now using system version of node: $(node -v 2>/dev/null)$(nvm_print_npm_version)" echo "Now using system version of node: $(node -v 2>/dev/null)$(nvm_print_npm_version)"
fi fi
return return
elif nvm_has_system_iojs && nvm deactivate >/dev/null 2>&1; then elif nvm_has_system_iojs && nvm deactivate >/dev/null 2>&1; then
if [ $silent -ne 1 ]; then if [ $NVM_USE_SILENT -ne 1 ]; then
echo "Now using system version of io.js: $(iojs --version 2>/dev/null)$(nvm_print_npm_version)" echo "Now using system version of io.js: $(iojs --version 2>/dev/null)$(nvm_print_npm_version)"
fi fi
return return
else else
if [ $silent -ne 1 ]; then if [ $NVM_USE_SILENT -ne 1 ]; then
echo "System version of node not found." >&2 echo "System version of node not found." >&2
fi fi
return 127 return 127
fi fi
elif [ "_$VERSION" = "_∞" ]; then elif [ "_$VERSION" = "_∞" ]; then
if [ $silent -ne 1 ]; then if [ $NVM_USE_SILENT -ne 1 ]; then
echo "The alias \"$PROVIDED_VERSION\" leads to an infinite loop. Aborting." >&2 echo "The alias \"$PROVIDED_VERSION\" leads to an infinite loop. Aborting." >&2
fi fi
return 8 return 8
@@ -1525,11 +1525,11 @@ nvm() {
command rm -f "$NVM_DIR/current" && ln -s "$NVM_VERSION_DIR" "$NVM_DIR/current" command rm -f "$NVM_DIR/current" && ln -s "$NVM_VERSION_DIR" "$NVM_DIR/current"
fi fi
if nvm_is_iojs_version "$VERSION"; then if nvm_is_iojs_version "$VERSION"; then
if [ $silent -ne 1 ]; then if [ $NVM_USE_SILENT -ne 1 ]; then
echo "Now using io.js $(nvm_strip_iojs_prefix "$VERSION")$(nvm_print_npm_version)" echo "Now using io.js $(nvm_strip_iojs_prefix "$VERSION")$(nvm_print_npm_version)"
fi fi
else else
if [ $silent -ne 1 ]; then if [ $NVM_USE_SILENT -ne 1 ]; then
echo "Now using node $VERSION$(nvm_print_npm_version)" echo "Now using node $VERSION$(nvm_print_npm_version)"
fi fi
fi fi