Make sure checksum commands are not aliases.

Fixes #659, #420, #640.
master
Jordan Harband 2015-02-15 23:32:33 -08:00
parent 3d6b7976e7
commit 820074e1d7
1 changed files with 14 additions and 6 deletions

20
nvm.sh
View File

@ -12,6 +12,10 @@ nvm_has() {
type "$1" > /dev/null 2>&1 type "$1" > /dev/null 2>&1
} }
nvm_is_alias() {
command alias "$1" > /dev/null 2>&1
}
nvm_get_latest() { nvm_get_latest() {
local NVM_LATEST_URL local NVM_LATEST_URL
if nvm_has "curl"; then if nvm_has "curl"; then
@ -633,15 +637,19 @@ nvm_ls_remote_iojs() {
} }
nvm_checksum() { nvm_checksum() {
if nvm_has "sha1sum"; then local NVM_CHECKSUM
checksum="$(command sha1sum "$1" | command awk '{print $1}')" if nvm_has "sha1sum" && ! nvm_is_alias "sha1sum"; then
elif nvm_has "sha1"; then NVM_CHECKSUM="$(command sha1sum "$1" | command awk '{print $1}')"
checksum="$(command sha1 -q "$1")" elif nvm_has "sha1" && ! nvm_is_alias "sha1"; then
NVM_CHECKSUM="$(command sha1 -q "$1")"
elif nvm_has "shasum" && ! nvm_is_alias "shasum"; then
NVM_CHECKSUM="$(shasum "$1" | command awk '{print $1}')"
else else
checksum="$(shasum "$1" | command awk '{print $1}')" echo "Unaliased sha1sum, sha1, or shasum not found." >&2
return 2
fi fi
if [ "_$checksum" = "_$2" ]; then if [ "_$NVM_CHECKSUM" = "_$2" ]; then
return return
elif [ -z "$2" ]; then elif [ -z "$2" ]; then
echo 'Checksums empty' #missing in raspberry pi binary echo 'Checksums empty' #missing in raspberry pi binary