diff options
| author | Rainer Keller <Rainer.Keller@qt.io> | 2018-03-08 08:24:33 +0100 |
|---|---|---|
| committer | Aapo Keskimolo <aapo.keskimolo@qt.io> | 2018-03-10 13:31:34 +0000 |
| commit | 04d1ee1df4302c78be54da76826221661ff25056 (patch) | |
| tree | 9edbe10874fc5a82b5529c210ac445e20e11a6ec /coin/provisioning/common/unix | |
| parent | 00e3a0149a9da44a90400a232aeb481770170dea (diff) | |
Provisioning: Create symbolic for shasum tool on macOS for compatibility
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 <joni.jantti@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
Diffstat (limited to 'coin/provisioning/common/unix')
| -rwxr-xr-x | coin/provisioning/common/unix/DownloadURL.sh | 2 | ||||
| -rwxr-xr-x | coin/provisioning/common/unix/libclang.sh | 7 |
2 files changed, 2 insertions, 7 deletions
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 |