From 04d1ee1df4302c78be54da76826221661ff25056 Mon Sep 17 00:00:00 2001 From: Rainer Keller Date: Thu, 8 Mar 2018 08:24:33 +0100 Subject: Provisioning: Create symbolic for shasum tool on macOS for compatibility MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On macOS the sha1 tool is named 'shasum' while on all other unix systems it is called 'sha1sum'. In order to make all unix provisioning scripts run on macOS without special case handling a symbolic link is created. Change-Id: Ib1365cbb0dcb31e68a22959ce939fb450ec7e3f7 Reviewed-by: Joni Jäntti Reviewed-by: Frederik Gladhorn Reviewed-by: Simo Fält --- coin/provisioning/common/unix/DownloadURL.sh | 2 +- coin/provisioning/common/unix/libclang.sh | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) (limited to 'coin/provisioning/common/unix') diff --git a/coin/provisioning/common/unix/DownloadURL.sh b/coin/provisioning/common/unix/DownloadURL.sh index cb890e8a..d3a8a7d0 100755 --- a/coin/provisioning/common/unix/DownloadURL.sh +++ b/coin/provisioning/common/unix/DownloadURL.sh @@ -71,7 +71,7 @@ function DownloadURL { } echo "Checking SHA1 on PKG '$targetFile'" echo "$expectedSha1 *$targetFile" > $targetFile.sha1 - shasum --check $targetFile.sha1 || throw $ExceptionSHA1 + sha1sum --check $targetFile.sha1 || throw $ExceptionSHA1 ) catch || { diff --git a/coin/provisioning/common/unix/libclang.sh b/coin/provisioning/common/unix/libclang.sh index d59c9fa2..7f29259e 100755 --- a/coin/provisioning/common/unix/libclang.sh +++ b/coin/provisioning/common/unix/libclang.sh @@ -60,12 +60,7 @@ zip="libclang.7z" destination="/usr/local/libclang-$version" curl --fail -L --retry 5 --retry-delay 5 -o "$zip" "$url" -_shasum=sha1sum -if [[ "$OSTYPE" == "darwin"* ]]; then - echo "DARWIN" - _shasum=/usr/bin/shasum -fi -echo "$sha1 $zip" | $_shasum --check +echo "$sha1 $zip" | sha1sum --check 7z x $zip -o/tmp/ rm -rf $zip -- cgit v1.2.3