From 56f9bc27a4ffa49cffc9327e8fefaee81a382031 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Mon, 23 Jan 2023 13:26:47 +0000
Subject: [PATCH] Move validate_checksum to common.sh

---
 .circleci/osx_install_dependencies.sh     | 17 +++--------------
 scripts/common.sh                         | 15 +++++++++++++++
 scripts/install_obsolete_jsoncpp_1_7_4.sh | 10 +++++-----
 3 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/.circleci/osx_install_dependencies.sh b/.circleci/osx_install_dependencies.sh
index f742d131b..87a55d577 100755
--- a/.circleci/osx_install_dependencies.sh
+++ b/.circleci/osx_install_dependencies.sh
@@ -35,20 +35,9 @@
 
 set -eu
 
-function validate_checksum {
-  local package="$1"
-  local expected_checksum="$2"
-
-  local actual_checksum
-  actual_checksum=$(sha256sum "$package")
-  if [[ $actual_checksum != "${expected_checksum}  ${package}" ]]
-  then
-    >&2 echo "ERROR: Wrong checksum for package $package."
-    >&2 echo "Actual:   $actual_checksum"
-    >&2 echo "Expected: $expected_checksum"
-    exit 1
-  fi
-}
+REPO_ROOT=$(cd "$(dirname "$0")/.." && pwd)
+# shellcheck source=scripts/common.sh
+source "${REPO_ROOT}/scripts/common.sh"
 
 if [ ! -f /usr/local/lib/libz3.a ] # if this file does not exists (cache was not restored), rebuild dependencies
 then
diff --git a/scripts/common.sh b/scripts/common.sh
index b5c6ada91..5c7635531 100644
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -313,3 +313,18 @@ function command_available
         fail "'${program}' not found or not executed successfully with parameter(s) '${parameters}'. aborting."
     fi
 }
+
+function validate_checksum {
+  local package="$1"
+  local expected_checksum="$2"
+
+  local actual_checksum
+  actual_checksum=$(sha256sum "$package")
+  if [[ $actual_checksum != "${expected_checksum}  ${package}" ]]
+  then
+    >&2 echo "ERROR: Wrong checksum for package $package."
+    >&2 echo "Actual:   $actual_checksum"
+    >&2 echo "Expected: $expected_checksum"
+    exit 1
+  fi
+}
diff --git a/scripts/install_obsolete_jsoncpp_1_7_4.sh b/scripts/install_obsolete_jsoncpp_1_7_4.sh
index 825d1a58a..e1c3c199f 100755
--- a/scripts/install_obsolete_jsoncpp_1_7_4.sh
+++ b/scripts/install_obsolete_jsoncpp_1_7_4.sh
@@ -1,6 +1,10 @@
 #!/usr/bin/env bash
 set -eu
 
+REPO_ROOT=$(cd "$(dirname "$0")/.." && pwd)
+# shellcheck source=scripts/common.sh
+source "${REPO_ROOT}/scripts/common.sh"
+
 TEMPDIR=$(mktemp -d)
 (
     cd "$TEMPDIR"
@@ -8,11 +12,7 @@ TEMPDIR=$(mktemp -d)
     jsoncpp_package="jsoncpp-${jsoncpp_version}.tar.gz"
     jsoncpp_sha256=10dcd0677e80727e572a1e462193e51a5fde3e023b99e144b2ee1a469835f769
     wget -O "$jsoncpp_package" https://github.com/open-source-parsers/jsoncpp/archive/${jsoncpp_version}.tar.gz
-    if ! [ "$(sha256sum "$jsoncpp_package")" = "${jsoncpp_sha256}  ${jsoncpp_package}" ]
-    then
-        >&2 echo "ERROR: Downloaded jsoncpp source package has wrong checksum."
-        exit 1
-    fi
+    validate_checksum "$jsoncpp_package" "$jsoncpp_sha256"
     tar xvzf "$jsoncpp_package"
     cd "jsoncpp-${jsoncpp_version}"
     mkdir -p build