diff --git a/test/install-sharness.sh b/test/install-sharness.sh index 47438637f9a82113e861e435d91bd74c369aea31..659c332a114f753a36f2436c263cfa78229ae224 100755 --- a/test/install-sharness.sh +++ b/test/install-sharness.sh @@ -7,22 +7,43 @@ # settings version=50229a79ba22b2f13ccd82451d86570fecbd194c -hash1=eeaf96630fc25ec58fb678b64ef9772d5eb92f64 -url=https://raw.githubusercontent.com/mlafeldt/sharness/$version/sharness.sh -file=sharness.sh - -# download it -wget -q $url -O $file.test - -# verify it's the right file -hash2=`cat $file.test | shasum | cut -c1-40` -if test "$hash1" != "$hash2"; then - echo "$file verification failed" - echo "$hash1 != $hash2" - rm $file.test +urlprefix=https://raw.githubusercontent.com/mlafeldt/sharness/$version + +# files to download +sfile=sharness.sh +shash=eeaf96630fc25ec58fb678b64ef9772d5eb92f64 + +afile=aggregate-results.sh +ahash=948d6bc03222c5c00a1ed048068508d5ea1cce59 + +verified_download() { + file=$1 + hash1=$2 + url=$urlprefix/$file + + # download it + wget -q $url -O $file.test + + # verify it's the right file + hash2=`cat $file.test | shasum | cut -c1-40` + if test "$hash1" != "$hash2"; then + echo "$file verification failed:" + echo " $hash1 != $hash2" + return -1 + fi + return 0 +} + + +verified_download "$sfile" "$shash"; sok=$? +verified_download "$afile" "$ahash"; aok=$? +if test "$sok" != 0 || test "$aok" != 0; then + rm $afile.test + rm $sfile.test exit -1 fi -# ok, move it into place -mv $file.test $file +# ok, move things into place +mv $sfile.test $sfile +mv $afile.test $afile exit 0