273345896
/
nvm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Refactor] Use `||:` and `&&:` when appropriate

Jordan Harband 2016-09-16 23:16:58 -07:00
parent 4a7973ea61
commit 51b21bcad1
No known key found for this signature in database
GPG Key ID: 64A196AEE0916D55
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
nvm.sh
View File

@ -313,10 +313,10 @@ nvm_remote_version() {
if nvm_validate_implicit_alias "${PATTERN}" 2> /dev/null ; then if nvm_validate_implicit_alias "${PATTERN}" 2> /dev/null ; then
case "${PATTERN}" in case "${PATTERN}" in
"$(nvm_iojs_prefix)") "$(nvm_iojs_prefix)")
VERSION="$(NVM_LTS="${NVM_LTS-}" nvm_ls_remote_iojs | command tail -1)" VERSION="$(NVM_LTS="${NVM_LTS-}" nvm_ls_remote_iojs | command tail -1)" &&:
;; ;;
*) *)
VERSION="$(NVM_LTS="${NVM_LTS-}" nvm_ls_remote "${PATTERN}")" VERSION="$(NVM_LTS="${NVM_LTS-}" nvm_ls_remote "${PATTERN}")" &&:
;; ;;
esac esac
else else
@ -342,10 +342,10 @@ nvm_remote_versions() {
PATTERN="${1-}" PATTERN="${1-}"
case "${PATTERN}" in case "${PATTERN}" in
"${NVM_IOJS_PREFIX}" | "io.js") "${NVM_IOJS_PREFIX}" | "io.js")
VERSIONS="$(NVM_LTS="${NVM_LTS-}" nvm_ls_remote_iojs)" VERSIONS="$(NVM_LTS="${NVM_LTS-}" nvm_ls_remote_iojs)" &&:
;; ;;
"$(nvm_node_prefix)") "$(nvm_node_prefix)")
VERSIONS="$(NVM_LTS="${NVM_LTS-}" nvm_ls_remote)" VERSIONS="$(NVM_LTS="${NVM_LTS-}" nvm_ls_remote)" &&:
;; ;;
*) *)
if nvm_validate_implicit_alias "${PATTERN}" 2> /dev/null ; then if nvm_validate_implicit_alias "${PATTERN}" 2> /dev/null ; then
@ -353,7 +353,7 @@ nvm_remote_versions() {
return 1 return 1
fi fi
VERSIONS="$(nvm_echo "$(NVM_LTS="${NVM_LTS-}" nvm_ls_remote "${PATTERN}") VERSIONS="$(nvm_echo "$(NVM_LTS="${NVM_LTS-}" nvm_ls_remote "${PATTERN}")
$(NVM_LTS=${NVM_LTS-} nvm_ls_remote_iojs "${PATTERN}")" | nvm_grep -v "N/A" | command sed '/^$/d')" $(NVM_LTS=${NVM_LTS-} nvm_ls_remote_iojs "${PATTERN}")" | nvm_grep -v "N/A" | command sed '/^$/d')" &&:
;; ;;
esac esac
@ -463,7 +463,7 @@ nvm_print_formatted_alias() {
local VERSION local VERSION
VERSION="${3-}" VERSION="${3-}"
if [ -z "${VERSION}" ]; then if [ -z "${VERSION}" ]; then
VERSION="$(nvm_version "${DEST}" || return 0)" VERSION="$(nvm_version "${DEST}")" ||:
fi fi
local VERSION_FORMAT local VERSION_FORMAT
local ALIAS_FORMAT local ALIAS_FORMAT
@ -528,7 +528,7 @@ nvm_print_alias_path() {
local ALIAS local ALIAS
ALIAS="${ALIAS_PATH##${NVM_ALIAS_DIR}\/}" ALIAS="${ALIAS_PATH##${NVM_ALIAS_DIR}\/}"
local DEST local DEST
DEST="$(nvm_alias "${ALIAS}" 2> /dev/null || return 0)" DEST="$(nvm_alias "${ALIAS}" 2> /dev/null)" ||:
if [ -n "${DEST}" ]; then if [ -n "${DEST}" ]; then
NVM_NO_COLORS="${NVM_NO_COLORS-}" NVM_LTS="${NVM_LTS-}" DEFAULT=false nvm_print_formatted_alias "${ALIAS}" "${DEST}" NVM_NO_COLORS="${NVM_NO_COLORS-}" NVM_LTS="${NVM_LTS-}" DEFAULT=false nvm_print_formatted_alias "${ALIAS}" "${DEST}"
fi fi
@ -1318,7 +1318,7 @@ nvm_print_implicit_alias() {
local NVM_IOJS_VERSION local NVM_IOJS_VERSION
local EXIT_CODE local EXIT_CODE
NVM_IOJS_VERSION="$($NVM_COMMAND)" NVM_IOJS_VERSION="$($NVM_COMMAND)" &&:
EXIT_CODE="$?" EXIT_CODE="$?"
if [ "_$EXIT_CODE" = "_0" ]; then if [ "_$EXIT_CODE" = "_0" ]; then
NVM_IOJS_VERSION="$(nvm_echo "$NVM_IOJS_VERSION" | command sed "s/^$NVM_IMPLICIT-//" | nvm_grep -e '^v' | command cut -c2- | command cut -d . -f 1,2 | uniq | command tail -1)" NVM_IOJS_VERSION="$(nvm_echo "$NVM_IOJS_VERSION" | command sed "s/^$NVM_IMPLICIT-//" | nvm_grep -e '^v' | command cut -c2- | command cut -d . -f 1,2 | uniq | command tail -1)"
@ -2244,11 +2244,11 @@ nvm() {
case "$1" in case "$1" in
--reinstall-packages-from=*) --reinstall-packages-from=*)
PROVIDED_REINSTALL_PACKAGES_FROM="$(nvm_echo "$1" | command cut -c 27-)" PROVIDED_REINSTALL_PACKAGES_FROM="$(nvm_echo "$1" | command cut -c 27-)"
REINSTALL_PACKAGES_FROM="$(nvm_version "$PROVIDED_REINSTALL_PACKAGES_FROM" || return 0)" REINSTALL_PACKAGES_FROM="$(nvm_version "$PROVIDED_REINSTALL_PACKAGES_FROM")" ||:
;; ;;
--copy-packages-from=*) --copy-packages-from=*)
PROVIDED_REINSTALL_PACKAGES_FROM="$(nvm_echo "$1" | command cut -c 22-)" PROVIDED_REINSTALL_PACKAGES_FROM="$(nvm_echo "$1" | command cut -c 22-)"
REINSTALL_PACKAGES_FROM="$(nvm_version "$PROVIDED_REINSTALL_PACKAGES_FROM" || return 0)" REINSTALL_PACKAGES_FROM="$(nvm_version "$PROVIDED_REINSTALL_PACKAGES_FROM")" ||:
;; ;;
*) *)
ADDITIONAL_PARAMETERS="$ADDITIONAL_PARAMETERS $1" ADDITIONAL_PARAMETERS="$ADDITIONAL_PARAMETERS $1"
@ -2589,7 +2589,7 @@ nvm() {
nvm_rc_version && has_checked_nvmrc=1 nvm_rc_version && has_checked_nvmrc=1
fi fi
if [ -n "$NVM_RC_VERSION" ]; then if [ -n "$NVM_RC_VERSION" ]; then
VERSION="$(nvm_version "$NVM_RC_VERSION" || return 0)" VERSION="$(nvm_version "$NVM_RC_VERSION")" ||:
fi fi
if [ "${VERSION:-N/A}" = 'N/A' ]; then if [ "${VERSION:-N/A}" = 'N/A' ]; then
>&2 nvm --help >&2 nvm --help
@ -2600,7 +2600,7 @@ nvm() {
if [ -z "${NVM_LTS-}" ]; then if [ -z "${NVM_LTS-}" ]; then
provided_version="$1" provided_version="$1"
if [ -n "$provided_version" ]; then if [ -n "$provided_version" ]; then
VERSION="$(nvm_version "$provided_version" || return 0)" VERSION="$(nvm_version "$provided_version")" ||:
if [ "_${VERSION:-N/A}" = '_N/A' ] && ! nvm_is_valid_version "$provided_version"; then if [ "_${VERSION:-N/A}" = '_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
@ -2610,7 +2610,7 @@ nvm() {
nvm_rc_version && has_checked_nvmrc=1 nvm_rc_version && has_checked_nvmrc=1
fi fi
fi fi
VERSION="$(nvm_version "$NVM_RC_VERSION" || return 0)" VERSION="$(nvm_version "$NVM_RC_VERSION")" ||:
else else
shift shift
fi fi
@ -2678,7 +2678,7 @@ nvm() {
provided_version="lts/${NVM_LTS:-*}" provided_version="lts/${NVM_LTS:-*}"
VERSION="$provided_version" VERSION="$provided_version"
elif [ -n "$provided_version" ]; then elif [ -n "$provided_version" ]; then
VERSION="$(nvm_version "$provided_version" || return 0)" VERSION="$(nvm_version "$provided_version")" ||:
if [ "_$VERSION" = '_N/A' ] && ! nvm_is_valid_version "$provided_version"; then if [ "_$VERSION" = '_N/A' ] && ! nvm_is_valid_version "$provided_version"; then
if [ -n "${NVM_SILENT-}" ]; then if [ -n "${NVM_SILENT-}" ]; then
nvm_rc_version >/dev/null 2>&1 nvm_rc_version >/dev/null 2>&1
@ -2686,7 +2686,7 @@ nvm() {
nvm_rc_version nvm_rc_version
fi fi
provided_version="$NVM_RC_VERSION" provided_version="$NVM_RC_VERSION"
VERSION="$(nvm_version "$provided_version" || return 0)" VERSION="$(nvm_version "$provided_version")" ||:
else else
shift shift
fi fi
@ -2842,10 +2842,10 @@ $NVM_LS_REMOTE_POST_MERGED_OUTPUT" | nvm_grep -v "N/A" | command sed '/^$/d')"
nvm_rc_version nvm_rc_version
if [ -n "${NVM_RC_VERSION}" ]; then if [ -n "${NVM_RC_VERSION}" ]; then
provided_version="${NVM_RC_VERSION}" provided_version="${NVM_RC_VERSION}"
VERSION=$(nvm_version "${NVM_RC_VERSION}" || return 0) VERSION=$(nvm_version "${NVM_RC_VERSION}") ||:
fi fi
elif [ "_${1}" != '_system' ]; then elif [ "_${1}" != '_system' ]; then
VERSION="$(nvm_version "${provided_version}" || return 0)" VERSION="$(nvm_version "${provided_version}")" ||:
else else
VERSION="${1-}" VERSION="${1-}"
fi fi
@ -2926,7 +2926,7 @@ $NVM_LS_REMOTE_POST_MERGED_OUTPUT" | nvm_grep -v "N/A" | command sed '/^$/d')"
nvm_err 'Aliases in subdirectories are not supported.' nvm_err 'Aliases in subdirectories are not supported.'
return 1 return 1
fi fi
VERSION="$(nvm_version "${TARGET}" || return 0)" VERSION="$(nvm_version "${TARGET}")" ||:
if [ "${VERSION}" = 'N/A' ]; then if [ "${VERSION}" = 'N/A' ]; then
nvm_err "! WARNING: Version '${TARGET}' does not exist." nvm_err "! WARNING: Version '${TARGET}' does not exist."
fi fi
@ -2967,7 +2967,7 @@ $NVM_LS_REMOTE_POST_MERGED_OUTPUT" | nvm_grep -v "N/A" | command sed '/^$/d')"
local PROVIDED_VERSION local PROVIDED_VERSION
PROVIDED_VERSION="${1-}" PROVIDED_VERSION="${1-}"
if [ "$PROVIDED_VERSION" = "$(nvm_ls_current)" ] || [ "$(nvm_version "$PROVIDED_VERSION" || return 0)" = "$(nvm_ls_current)" ]; then if [ "$PROVIDED_VERSION" = "$(nvm_ls_current)" ] || [ "$(nvm_version "$PROVIDED_VERSION" ||:)" = "$(nvm_ls_current)" ]; then
nvm_err 'Can not reinstall packages from the current version of node.' nvm_err 'Can not reinstall packages from the current version of node.'
return 2 return 2
fi fi
@ -2980,7 +2980,7 @@ $NVM_LS_REMOTE_POST_MERGED_OUTPUT" | nvm_grep -v "N/A" | command sed '/^$/d')"
fi fi
VERSION="system" VERSION="system"
else else
VERSION="$(nvm_version "$PROVIDED_VERSION" || return 0)" VERSION="$(nvm_version "$PROVIDED_VERSION")" ||:
fi fi
local NPMLIST local NPMLIST