[refactor] `nvm run`: refactor argument parsing.
parent
0d62626ac6
commit
e8355e3189
26
nvm.sh
26
nvm.sh
|
@ -2108,14 +2108,22 @@ nvm() {
|
||||||
shift
|
shift
|
||||||
|
|
||||||
local NVM_SILENT
|
local NVM_SILENT
|
||||||
NVM_SILENT=0
|
while [ $# -gt 0 ]
|
||||||
if [ "_$1" = "_--silent" ]; then
|
do
|
||||||
NVM_SILENT=1
|
case "$1" in
|
||||||
shift
|
--silent) NVM_SILENT='--silent' ; shift ;;
|
||||||
fi
|
*)
|
||||||
|
if [ -n "$1" ]; then
|
||||||
|
break
|
||||||
|
else
|
||||||
|
shift
|
||||||
|
fi
|
||||||
|
;; # stop processing arguments
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
if [ $# -lt 1 ]; then
|
if [ $# -lt 1 ]; then
|
||||||
if [ "$NVM_SILENT" -eq 1 ]; then
|
if [ -n "${NVM_SILENT-}" ]; then
|
||||||
nvm_rc_version >/dev/null 2>&1 && has_checked_nvmrc=1
|
nvm_rc_version >/dev/null 2>&1 && has_checked_nvmrc=1
|
||||||
else
|
else
|
||||||
nvm_rc_version && has_checked_nvmrc=1
|
nvm_rc_version && has_checked_nvmrc=1
|
||||||
|
@ -2137,7 +2145,7 @@ nvm() {
|
||||||
if [ "_$VERSION" = "_N/A" ] && ! nvm_is_valid_version "$provided_version"; then
|
if [ "_$VERSION" = "_N/A" ] && ! nvm_is_valid_version "$provided_version"; then
|
||||||
provided_version=''
|
provided_version=''
|
||||||
if [ $has_checked_nvmrc -ne 1 ]; then
|
if [ $has_checked_nvmrc -ne 1 ]; then
|
||||||
if [ "$NVM_SILENT" -eq 1 ]; then
|
if [ -n "${NVM_SILENT-}" ]; then
|
||||||
nvm_rc_version >/dev/null 2>&1 && has_checked_nvmrc=1
|
nvm_rc_version >/dev/null 2>&1 && has_checked_nvmrc=1
|
||||||
else
|
else
|
||||||
nvm_rc_version && has_checked_nvmrc=1
|
nvm_rc_version && has_checked_nvmrc=1
|
||||||
|
@ -2176,11 +2184,11 @@ nvm() {
|
||||||
fi
|
fi
|
||||||
EXIT_CODE="$?"
|
EXIT_CODE="$?"
|
||||||
elif [ "$NVM_IOJS" = true ]; then
|
elif [ "$NVM_IOJS" = true ]; then
|
||||||
[ $NVM_SILENT -eq 1 ] || echo "Running io.js $(nvm_strip_iojs_prefix "$VERSION")$(nvm use --silent "$VERSION" && nvm_print_npm_version)"
|
[ -n "${NVM_SILENT-}" ] || echo "Running io.js $(nvm_strip_iojs_prefix "$VERSION")$(nvm use --silent "$VERSION" && nvm_print_npm_version)"
|
||||||
OUTPUT="$(nvm use "$VERSION" >/dev/null && iojs $ARGS)"
|
OUTPUT="$(nvm use "$VERSION" >/dev/null && iojs $ARGS)"
|
||||||
EXIT_CODE="$?"
|
EXIT_CODE="$?"
|
||||||
else
|
else
|
||||||
[ $NVM_SILENT -eq 1 ] || echo "Running node $VERSION$(nvm use --silent "$VERSION" && nvm_print_npm_version)"
|
[ -n "${NVM_SILENT-}" ] || echo "Running node $VERSION$(nvm use --silent "$VERSION" && nvm_print_npm_version)"
|
||||||
OUTPUT="$(nvm use "$VERSION" >/dev/null && node $ARGS)"
|
OUTPUT="$(nvm use "$VERSION" >/dev/null && node $ARGS)"
|
||||||
EXIT_CODE="$?"
|
EXIT_CODE="$?"
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue