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

[Fix] add missing "command" prefix call for some commands

Browse Source
This commit is contained in:
Peter Dave Hello
2016-11-11 19:37:56 +08:00
parent c5303a6973
commit eab41ed8ef
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bash_completion
View File

@@ -57,7 +57,7 @@ __nvm_aliases ()
declare aliases declare aliases
aliases="" aliases=""
if [ -d $NVM_DIR/alias ]; then if [ -d $NVM_DIR/alias ]; then
aliases="$(cd $NVM_DIR/alias && find $PWD -type f | sed "s:$PWD/::")" aliases="$(cd $NVM_DIR/alias && command find $PWD -type f | command sed "s:$PWD/::")"
fi fi
echo "${aliases} node stable unstable iojs" echo "${aliases} node stable unstable iojs"
} }

28
nvm.sh
View File

@@ -450,7 +450,7 @@ nvm_format_version() {
if [ "${NUM_GROUPS}" -lt 3 ]; then if [ "${NUM_GROUPS}" -lt 3 ]; then
nvm_format_version "${VERSION%.}.0" nvm_format_version "${VERSION%.}.0"
else else
nvm_echo "${VERSION}" | cut -f1-3 -d. nvm_echo "${VERSION}" | command cut -f1-3 -d.
fi fi
} }
@@ -892,7 +892,7 @@ nvm_ls() {
PATTERN='v' PATTERN='v'
SEARCH_PATTERN='.*' SEARCH_PATTERN='.*'
else else
SEARCH_PATTERN="$(echo "${PATTERN}" | sed "s#\.#\\\.#g;")" SEARCH_PATTERN="$(echo "${PATTERN}" | command sed "s#\.#\\\.#g;")"
fi fi
if [ -n "${NVM_DIRS_TO_SEARCH1}${NVM_DIRS_TO_SEARCH2}${NVM_DIRS_TO_SEARCH3}" ]; then if [ -n "${NVM_DIRS_TO_SEARCH1}${NVM_DIRS_TO_SEARCH2}${NVM_DIRS_TO_SEARCH3}" ]; then
VERSIONS="$(command find "${NVM_DIRS_TO_SEARCH1}"/* "${NVM_DIRS_TO_SEARCH2}"/* "${NVM_DIRS_TO_SEARCH3}"/* -name . -o -type d -prune -o -path "${PATTERN}*" \ VERSIONS="$(command find "${NVM_DIRS_TO_SEARCH1}"/* "${NVM_DIRS_TO_SEARCH2}"/* "${NVM_DIRS_TO_SEARCH3}"/* -name . -o -type d -prune -o -path "${PATTERN}*" \
@@ -988,9 +988,9 @@ nvm_ls_remote_index_tab() {
;; ;;
esac esac
local SORT_COMMAND local SORT_COMMAND
SORT_COMMAND='sort' SORT_COMMAND='command sort'
case "${FLAVOR}" in case "${FLAVOR}" in
node) SORT_COMMAND='sort -t. -u -k 1.2,1n -k 2,2n -k 3,3n' ;; node) SORT_COMMAND='command sort -t. -u -k 1.2,1n -k 2,2n -k 3,3n' ;;
esac esac
local PATTERN local PATTERN
@@ -1023,7 +1023,7 @@ nvm_ls_remote_index_tab() {
local LTS_VERSION local LTS_VERSION
command mkdir -p "$(nvm_alias_path)/lts" command mkdir -p "$(nvm_alias_path)/lts"
nvm_echo "${VERSION_LIST}" \ nvm_echo "${VERSION_LIST}" \
| awk '{ | command awk '{
if ($10 ~ /^\-?$/) { next } if ($10 ~ /^\-?$/) { next }
if ($10 && !a[tolower($10)]++) { if ($10 && !a[tolower($10)]++) {
if (alias) { print alias, version } if (alias) { print alias, version }
@@ -1205,26 +1205,26 @@ nvm_checksum() {
elif nvm_has "sha1" && ! nvm_is_alias "sha1"; then elif nvm_has "sha1" && ! nvm_is_alias "sha1"; then
NVM_CHECKSUM="$(command sha1 -q "${1-}")" NVM_CHECKSUM="$(command sha1 -q "${1-}")"
elif nvm_has "shasum" && ! nvm_is_alias "shasum"; then elif nvm_has "shasum" && ! nvm_is_alias "shasum"; then
NVM_CHECKSUM="$(shasum "${1-}" | command awk '{print $1}')" NVM_CHECKSUM="$(command shasum "${1-}" | command awk '{print $1}')"
else else
nvm_err 'Unaliased sha1sum, sha1, or shasum not found.' nvm_err 'Unaliased sha1sum, sha1, or shasum not found.'
return 2 return 2
fi fi
else else
if nvm_has "sha256sum" && ! nvm_is_alias "sha256sum"; then if nvm_has "sha256sum" && ! nvm_is_alias "sha256sum"; then
NVM_CHECKSUM="$(sha256sum "${1-}" | command awk '{print $1}')" NVM_CHECKSUM="$(command sha256sum "${1-}" | command awk '{print $1}')"
elif nvm_has "shasum" && ! nvm_is_alias "shasum"; then elif nvm_has "shasum" && ! nvm_is_alias "shasum"; then
NVM_CHECKSUM="$(shasum -a 256 "${1-}" | command awk '{print $1}')" NVM_CHECKSUM="$(command shasum -a 256 "${1-}" | command awk '{print $1}')"
elif nvm_has "sha256" && ! nvm_is_alias "sha256"; then elif nvm_has "sha256" && ! nvm_is_alias "sha256"; then
NVM_CHECKSUM="$(sha256 -q "${1-}" | command awk '{print $1}')" NVM_CHECKSUM="$(command sha256 -q "${1-}" | command awk '{print $1}')"
elif nvm_has "gsha256sum" && ! nvm_is_alias "gsha256sum"; then elif nvm_has "gsha256sum" && ! nvm_is_alias "gsha256sum"; then
NVM_CHECKSUM="$(gsha256sum "${1-}" | command awk '{print $1}')" NVM_CHECKSUM="$(command gsha256sum "${1-}" | command awk '{print $1}')"
elif nvm_has "openssl" && ! nvm_is_alias "openssl"; then elif nvm_has "openssl" && ! nvm_is_alias "openssl"; then
NVM_CHECKSUM="$(openssl dgst -sha256 "${1-}" | rev | command awk '{print $1}' | rev)" NVM_CHECKSUM="$(command openssl dgst -sha256 "${1-}" | rev | command awk '{print $1}' | rev)"
elif nvm_has "libressl" && ! nvm_is_alias "libressl"; then elif nvm_has "libressl" && ! nvm_is_alias "libressl"; then
NVM_CHECKSUM="$(libressl dgst -sha256 "${1-}" | rev | command awk '{print $1}' | rev)" NVM_CHECKSUM="$(command libressl dgst -sha256 "${1-}" | rev | command awk '{print $1}' | rev)"
elif nvm_has "bssl" && ! nvm_is_alias "bssl"; then elif nvm_has "bssl" && ! nvm_is_alias "bssl"; then
NVM_CHECKSUM="$(bssl sha256sum "${1-}" | command awk '{print $1}')" NVM_CHECKSUM="$(command bssl sha256sum "${1-}" | command awk '{print $1}')"
else else
nvm_err 'Unaliased sha256sum, shasum, sha256, gsha256sum, openssl, libressl, or bssl not found.' nvm_err 'Unaliased sha256sum, shasum, sha256, gsha256sum, openssl, libressl, or bssl not found.'
nvm_err 'WARNING: Continuing *without checksum verification*' nvm_err 'WARNING: Continuing *without checksum verification*'
@@ -1785,7 +1785,7 @@ nvm_get_make_jobs() {
elif [ "_$NVM_OS" = "_sunos" ]; then elif [ "_$NVM_OS" = "_sunos" ]; then
NVM_CPU_THREADS="$(psrinfo | wc -l)" NVM_CPU_THREADS="$(psrinfo | wc -l)"
elif [ "_$NVM_OS" = "_aix" ]; then elif [ "_$NVM_OS" = "_aix" ]; then
NVM_CPU_THREADS="$(lsconf|grep 'Number Of Processors:'| awk '{print $4}')" NVM_CPU_THREADS="$(lsconf | command grep 'Number Of Processors:'| command awk '{print $4}')"
fi fi
if ! nvm_is_natural_num "$NVM_CPU_THREADS" ; then if ! nvm_is_natural_num "$NVM_CPU_THREADS" ; then
nvm_err 'Can not determine how many thread(s) we can use, set to only 1 now.' nvm_err 'Can not determine how many thread(s) we can use, set to only 1 now.'