diff options
author | Heikki Halmet <heikki.halmet@qt.io> | 2018-05-24 13:17:27 +0300 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-06-29 13:37:36 +0000 |
commit | ecb01d283c1cf5d9e31bc96510086c347a3c505d (patch) | |
tree | 6eb0fc89088bb8b491108b68205f9338f664c14c /coin/provisioning/qtci-linux-RHEL-7.4-x86_64 | |
parent | 74fd490884e645094d3f03cd9c0d0e0d2b73954a (diff) | |
download | qt5-ecb01d283c1cf5d9e31bc96510086c347a3c505d.tar.gz |
Provisioning: Fetch icu from ci-files01 instead of master.qt.io
Change-Id: Ia27e68cb94ab0744ce11cfa74c90e118c1f0e4b3
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Diffstat (limited to 'coin/provisioning/qtci-linux-RHEL-7.4-x86_64')
-rwxr-xr-x | coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh index cb23bbca..7c4d46dd 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -33,6 +33,9 @@ ## ############################################################################# +# shellcheck source=../common/unix/DownloadURL.sh +source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" + set -ex # This script will install ICU @@ -40,16 +43,17 @@ set -ex icuVersion="56.1" icuLocation="/usr/lib64" sha1="6dd9ca6b185681a7ddc4bb94fd7fced27647a21c" -baseBinaryPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel7.2-x64.7z" +baseBinaryPackageURL="http://ci-files01-hki.intra.qt.io/input/icu/$icuVersion/icu-linux-g++-Rhel7.2-x64.7z" +baseBinaryPackageExternalURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel7.2-x64.7z" sha1Dev="bffde26cdea752bee0edd281820c57f1adac3864" -develPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel7.2-x64-devel.7z" +develPackageURL="http://ci-files01-hki.intra.qt.io/input/icu/$icuVersion/icu-linux-g++-Rhel7.2-x64-devel.7z" +develPackageExternalURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel7.2-x64-devel.7z" echo "Installing custom ICU $icuVersion $sha1 packages on RHEL to $icuLocation" targetFile=$(mktemp) -wget --tries=5 --waitretry=5 --output-document="$targetFile" "$baseBinaryPackageURL" -echo "$sha1 $targetFile" | sha1sum --check +DownloadURL "$baseBinaryPackageURL" "$baseBinaryPackageExternalURL" "$sha1" "$targetFile" sudo 7z x -y -o/usr/lib64 "$targetFile" sudo rm "$targetFile" @@ -58,8 +62,7 @@ echo "Installing custom ICU devel packages on RHEL" tempDir=$(mktemp -d) targetFile=$(mktemp) -wget --tries=5 --waitretry=5 --output-document="$targetFile" "$develPackageURL" -echo "$sha1Dev $targetFile" | sha1sum --check +DownloadURL "$develPackageURL" "$develPackageExternalURL" "$sha1Dev" "$targetFile" 7z x -y -o"$tempDir" "$targetFile" sudo cp -a "$tempDir"/lib/* /usr/lib64 |