diff --git a/configure.sh b/configure.sh index ed41490b8af..7ab0180865d 100755 --- a/configure.sh +++ b/configure.sh @@ -1,38 +1,27 @@ #!/bin/sh -GRADLE_WITNESS="1b8eaa3a788aac37ee78fa65579246d1ad268e3c8cf42cd2caeffc50b3e50056" GRADLE_WRAPPER="0f49043be582d7a39b671f924c66bd9337b92fa88ff5951225acc60560053067" -DOWNLOADED_HASH1='' -DOWNLOADED_HASH2='' -DOWNLOAD_FILE1=$(mktemp) -DOWNLOAD_FILE2=$(mktemp) +DOWNLOADED_HASH='' +DOWNLOAD_FILE=$(mktemp) unamestr=`uname` -trap 'rm -f "$DOWNLOAD_FILE1" "$DOWNLOAD_FILE2"' EXIT INT QUIT TERM +trap 'rm -f "$DOWNLOAD_FILE"' EXIT INT QUIT TERM downloadJar() { platform if [ ! -d ./rskj-core/libs ]; then mkdir ./rskj-core/libs fi - curl https://deps.rsklabs.io/rsk-gradle-witness.jar -o "$DOWNLOAD_FILE1" - curl https://deps.rsklabs.io/gradle-wrapper.jar -o "$DOWNLOAD_FILE2" + curl https://deps.rsklabs.io/gradle-wrapper.jar -o "$DOWNLOAD_FILE" if [ x"$PLATFORM" = x'linux' ] || [ x"$PLATFORM" = x'windows' ]; then - DOWNLOADED_HASH1=$(sha256sum "$DOWNLOAD_FILE1" | cut -d' ' -f1) - DOWNLOADED_HASH2=$(sha256sum "$DOWNLOAD_FILE2" | cut -d' ' -f1) + DOWNLOADED_HASH=$(sha256sum "$DOWNLOAD_FILE" | cut -d' ' -f1) elif [ x"$PLATFORM" = x'mac' ]; then - DOWNLOADED_HASH1=$(shasum -a 256 "$DOWNLOAD_FILE1" | cut -d' ' -f1) - DOWNLOADED_HASH2=$(shasum -a 256 "$DOWNLOAD_FILE2" | cut -d' ' -f1) + DOWNLOADED_HASH=$(shasum -a 256 "$DOWNLOAD_FILE" | cut -d' ' -f1) fi - if [ "$GRADLE_WITNESS" != "$DOWNLOADED_HASH1" ]; then + if [ "$GRADLE_WRAPPER" != "$DOWNLOADED_HASH" ]; then exit 1 else - mv "$DOWNLOAD_FILE1" ./rskj-core/libs/rsk-gradle-witness.jar - fi - if [ "$GRADLE_WRAPPER" != "$DOWNLOADED_HASH2" ]; then - exit 1 - else - mv "$DOWNLOAD_FILE2" ./gradle/wrapper/gradle-wrapper.jar + mv "$DOWNLOAD_FILE" ./gradle/wrapper/gradle-wrapper.jar fi }