From 2833ad91de3e823f10555c4739f29780afe07ffb Mon Sep 17 00:00:00 2001 From: Alan Zoppa Date: Tue, 20 Nov 2012 14:28:38 -0600 Subject: [PATCH 1/2] Verbose function declaration because ZSH on Debian Lenny complains --- scripts/functions/checksum | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/functions/checksum b/scripts/functions/checksum index 445c76ff64..644d6d1e6d 100755 --- a/scripts/functions/checksum +++ b/scripts/functions/checksum @@ -74,9 +74,9 @@ __rvm_checksum_calculate_file() _checksum_sha512="$( __rvm_sha__calculate 512 "${1:-}" )" } -__rvm_checksum_none() [[ -z "${_checksum_md5:-}" && -z "${_checksum_sha512:-}" ]] -__rvm_checksum_any() [[ -n "${_checksum_md5:-}" || -n "${_checksum_sha512:-}" ]] -__rvm_checksum_all() [[ -n "${_checksum_md5:-}" && -n "${_checksum_sha512:-}" ]] +__rvm_checksum_none() {[[ -z "${_checksum_md5:-}" && -z "${_checksum_sha512:-}" ]]} +__rvm_checksum_any() {[[ -n "${_checksum_md5:-}" || -n "${_checksum_sha512:-}" ]]} +__rvm_checksum_all() {[[ -n "${_checksum_md5:-}" && -n "${_checksum_sha512:-}" ]]} # __rvm_checksum_validate_file {file} # ENV in: _checksum_md5 _checksum_sha512 From d7040f698b733d908f8d8f5de0290820be6f972e Mon Sep 17 00:00:00 2001 From: Alan Zoppa Date: Tue, 20 Nov 2012 15:08:11 -0600 Subject: [PATCH 2/2] Code style fixes --- scripts/functions/checksum | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/scripts/functions/checksum b/scripts/functions/checksum index 644d6d1e6d..42ebbec333 100755 --- a/scripts/functions/checksum +++ b/scripts/functions/checksum @@ -74,9 +74,20 @@ __rvm_checksum_calculate_file() _checksum_sha512="$( __rvm_sha__calculate 512 "${1:-}" )" } -__rvm_checksum_none() {[[ -z "${_checksum_md5:-}" && -z "${_checksum_sha512:-}" ]]} -__rvm_checksum_any() {[[ -n "${_checksum_md5:-}" || -n "${_checksum_sha512:-}" ]]} -__rvm_checksum_all() {[[ -n "${_checksum_md5:-}" && -n "${_checksum_sha512:-}" ]]} +__rvm_checksum_none() +{ + [[ -z "${_checksum_md5:-}" && -z "${_checksum_sha512:-}" ]] +} + +__rvm_checksum_any() +{ + [[ -n "${_checksum_md5:-}" || -n "${_checksum_sha512:-}" ]] +} + +__rvm_checksum_all() +{ + [[ -n "${_checksum_md5:-}" && -n "${_checksum_sha512:-}" ]] +} # __rvm_checksum_validate_file {file} # ENV in: _checksum_md5 _checksum_sha512