Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fix] Correct nvm.sh indent #1724

Merged
merged 1 commit into from
Feb 9, 2018
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions nvm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -476,12 +476,12 @@ nvm_remote_versions() {

case "${PATTERN}" in
"${NVM_IOJS_PREFIX}" | "io.js")
NVM_FLAVOR="${NVM_IOJS_PREFIX}"
unset PATTERN
NVM_FLAVOR="${NVM_IOJS_PREFIX}"
unset PATTERN
;;
"${NVM_NODE_PREFIX}")
NVM_FLAVOR="${NVM_NODE_PREFIX}"
unset PATTERN
NVM_FLAVOR="${NVM_NODE_PREFIX}"
unset PATTERN
;;
esac

Expand Down Expand Up @@ -1584,9 +1584,9 @@ nvm_get_arch() {
HOST_ARCH=$(isainfo -n)
fi
elif [ "_$NVM_OS" = "_aix" ]; then
HOST_ARCH=ppc64
HOST_ARCH=ppc64
else
HOST_ARCH="$(command uname -m)"
HOST_ARCH="$(command uname -m)"
fi

local NVM_ARCH
Expand Down Expand Up @@ -1646,7 +1646,7 @@ nvm_ensure_default_set() {
}

nvm_is_merged_node_version() {
nvm_version_greater_than_or_equal_to "$1" v4.0.0
nvm_version_greater_than_or_equal_to "$1" v4.0.0
}

nvm_get_mirror() {
Expand Down Expand Up @@ -1761,7 +1761,7 @@ nvm_get_download_slug() {
NVM_ARCH="$(nvm_get_arch)"
if ! nvm_is_merged_node_version "${VERSION}"; then
if [ "${NVM_ARCH}" = 'armv6l' ] || [ "${NVM_ARCH}" = 'armv7l' ]; then
NVM_ARCH="arm-pi"
NVM_ARCH="arm-pi"
fi
fi

Expand Down Expand Up @@ -2664,9 +2664,9 @@ nvm() {
nvm_err "Currently, there is no binary for $NVM_OS"
elif [ "_$NVM_OS" = "_sunos" ]; then
# Not all node/io.js versions have a Solaris binary
if ! nvm_has_solaris_binary "$VERSION"; then
nobinary=1
nvm_err "Currently, there is no binary of version $VERSION for $NVM_OS"
if ! nvm_has_solaris_binary "$VERSION"; then
nobinary=1
nvm_err "Currently, there is no binary of version $VERSION for $NVM_OS"
fi
fi

Expand Down Expand Up @@ -3510,7 +3510,7 @@ nvm_auto() {
nvm install >/dev/null
fi
elif [ "_$NVM_MODE" = '_use' ]; then
VERSION="$(nvm_resolve_local_alias default 2>/dev/null || nvm_echo)"
VERSION="$(nvm_resolve_local_alias default 2>/dev/null || nvm_echo)"
if [ -n "$VERSION" ]; then
nvm use --silent "$VERSION" >/dev/null
elif nvm_rc_version >/dev/null 2>&1; then
Expand Down