From 142ae0f941081a53d14063fde509f09e7bf2eb13 Mon Sep 17 00:00:00 2001 From: Daniel Date: Tue, 14 May 2024 18:56:45 +0200 Subject: [PATCH] Fixed wrong sha check sha256sum outputs failing the string check --- Util/BuildTools/Setup.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Util/BuildTools/Setup.sh b/Util/BuildTools/Setup.sh index e91d149d7..64774d017 100755 --- a/Util/BuildTools/Setup.sh +++ b/Util/BuildTools/Setup.sh @@ -94,16 +94,16 @@ for PY_VERSION in ${PY_VERSION_LIST[@]} ; do log "Retrieving boost." start=$(date +%s) - wget "https://archives.boost.io/release/${BOOST_VERSION}/source/${BOOST_PACKAGE_BASENAME}.tar.gz" || true + wget "https://archives.boost.io/release/${BOOST_VERSION}/source/${BOOST_PACKAGE_BASENAME}.tar.gz" -O ${BOOST_PACKAGE_BASENAME}.tar.gz || true end=$(date +%s) echo "Elapsed Time downloading from boost webpage: $(($end-$start)) seconds" # try to use the backup boost we have in Jenkins - if [ ! -f "${BOOST_PACKAGE_BASENAME}.tar.gz" ] || [[ $(sha256sum "${BOOST_PACKAGE_BASENAME}.tar.gz") != "${BOOST_SHA256SUM}" ]] ; then + if [ ! -f "${BOOST_PACKAGE_BASENAME}.tar.gz" ] || [[ $(sha256sum "${BOOST_PACKAGE_BASENAME}.tar.gz" | cut -d " " -f 1 ) != "${BOOST_SHA256SUM}" ]] ; then log "Using boost backup" start=$(date +%s) - wget "https://carla-releases.s3.us-east-005.backblazeb2.com/Backup/${BOOST_PACKAGE_BASENAME}.tar.gz" || true + wget "https://carla-releases.s3.us-east-005.backblazeb2.com/Backup/${BOOST_PACKAGE_BASENAME}.tar.gz" -O ${BOOST_PACKAGE_BASENAME}.tar.gz || true end=$(date +%s) echo "Elapsed Time downloading from boost carla backup in backblaze: $(($end-$start)) seconds"