[shellcheck] clean up unquoted args etc

Jordan Harband 2016-05-11 15:37:21 -07:00
parent 6dd6a0d213
commit 6e18d959c7
No known key found for this signature in database
GPG Key ID: 64A196AEE0916D55
1 changed files with 7 additions and 9 deletions

16
nvm.sh
View File

@ -17,12 +17,12 @@ nvm_echo() {
nvm_echo() { nvm_echo() {
\printf %s\\n "$*" # on zsh, `command printf` sometimes fails \printf %s\\n "$*" # on zsh, `command printf` sometimes fails
} }
nvm_echo "$*" nvm_echo "$@"
} }
} }
nvm_err() { nvm_err() {
>&2 nvm_echo "$*" >&2 nvm_echo "$@"
} }
nvm_has() { nvm_has() {
@ -59,10 +59,10 @@ nvm_get_latest() {
nvm_download() { nvm_download() {
if nvm_has "curl"; then if nvm_has "curl"; then
curl -q $* curl -q "$@"
elif nvm_has "wget"; then elif nvm_has "wget"; then
# Emulate curl with wget # Emulate curl with wget
ARGS=$(nvm_echo "$*" | command sed -e 's/--progress-bar /--progress=bar /' \ ARGS=$(nvm_echo "$@" | command sed -e 's/--progress-bar /--progress=bar /' \
-e 's/-L //' \ -e 's/-L //' \
-e 's/-I /--server-response /' \ -e 's/-I /--server-response /' \
-e 's/-s /-q /' \ -e 's/-s /-q /' \
@ -1435,7 +1435,7 @@ nvm_get_make_jobs() {
else else
nvm_echo "Detected that you have $NVM_CPU_THREADS CPU thread(s)" nvm_echo "Detected that you have $NVM_CPU_THREADS CPU thread(s)"
if [ "$NVM_CPU_THREADS" -gt 2 ]; then if [ "$NVM_CPU_THREADS" -gt 2 ]; then
NVM_MAKE_JOBS=$(($NVM_CPU_THREADS - 1)) NVM_MAKE_JOBS=$((NVM_CPU_THREADS - 1))
nvm_echo "Set the number of jobs to $NVM_CPU_THREADS - 1 = $NVM_MAKE_JOBS jobs to speed up the build" nvm_echo "Set the number of jobs to $NVM_CPU_THREADS - 1 = $NVM_MAKE_JOBS jobs to speed up the build"
else else
NVM_MAKE_JOBS=1 NVM_MAKE_JOBS=1
@ -2231,8 +2231,6 @@ nvm() {
NVM_IOJS=true NVM_IOJS=true
fi fi
local ARGS
ARGS="$@"
local EXIT_CODE local EXIT_CODE
local ZHS_HAS_SHWORDSPLIT_UNSET local ZHS_HAS_SHWORDSPLIT_UNSET
@ -2244,9 +2242,9 @@ nvm() {
if [ "_$VERSION" = "_N/A" ]; then if [ "_$VERSION" = "_N/A" ]; then
nvm_ensure_version_installed "$provided_version" nvm_ensure_version_installed "$provided_version"
elif [ "$NVM_IOJS" = true ]; then elif [ "$NVM_IOJS" = true ]; then
nvm exec "${NVM_SILENT-}" "$VERSION" iojs $ARGS nvm exec "${NVM_SILENT-}" "$VERSION" iojs "$@"
else else
nvm exec "${NVM_SILENT-}" "$VERSION" node $ARGS nvm exec "${NVM_SILENT-}" "$VERSION" node "$@"
fi fi
EXIT_CODE="$?" EXIT_CODE="$?"
if [ "$ZHS_HAS_SHWORDSPLIT_UNSET" -eq 1 ] && nvm_has "unsetopt"; then if [ "$ZHS_HAS_SHWORDSPLIT_UNSET" -eq 1 ] && nvm_has "unsetopt"; then