diff options
-rwxr-xr-x | coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh | 24 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh | 17 |
2 files changed, 25 insertions, 16 deletions
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh index 67c17954..90d4199f 100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the test suite of the Qt Toolkit. @@ -33,6 +33,9 @@ ## ############################################################################# +# shellcheck source=../common/unix/DownloadURL.sh +source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" + # This script installs the right ICU version set -ex @@ -42,29 +45,31 @@ sha1="f2eab775c04ce5f3bdae6c47d06b62158b5d6753" function Install7ZPackageFromURL { url=$1 - expectedSha1=$2 - targetDirectory=$3 + urlExt=$2 + expectedSha1=$3 + targetDirectory=$4 targetFile=$(mktemp) - wget --tries=5 --waitretry=5 --output-document="$targetFile" "$url" - echo "$expectedSha1 $targetFile" | sha1sum --check + DownloadURL "$url" "$urlExt" "$expectedSha1" "$targetFile" sudo /usr/local/bin/7z x -yo"$targetDirectory" "$targetFile" rm "$targetFile" } echo "Installing custom ICU $icuVersion $sha1 packages on RHEL to $icuLocation" -baseBinaryPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel6.6-x64.7z" -Install7ZPackageFromURL "$baseBinaryPackageURL" "$sha1" "/usr/lib64" +baseBinaryPackageURL="http://ci-files01-hki.intra.qt.io/input/icu/$icuVersion/icu-linux-g++-Rhel6.6-x64.7z" +baseBinaryPackageExternalUrl="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel6.6-x64.7z" +Install7ZPackageFromURL "$baseBinaryPackageURL" "$baseBinaryPackageExternalUrl" "$sha1" "/usr/lib64" echo "Installing custom ICU devel packages on RHEL" sha1Dev="82f8b216371b848b8d36ecec7fe7b6e9b0dba0df" -develPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel6.6-x64-devel.7z" +develPackageURL="http://ci-files01-hki.intra.qt.io/input/icu/$icuVersion/icu-linux-g++-Rhel6.6-x64-devel.7z" +develPackageExternalUrl="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel6.6-x64-devel.7z" tempDir=$(mktemp -d) # shellcheck disable=SC2064 trap "sudo rm -fr $tempDir" EXIT -Install7ZPackageFromURL "$develPackageURL" "$sha1Dev" "$tempDir" +Install7ZPackageFromURL "$develPackageURL" "$develPackageExternalUrl" "$sha1Dev" "$tempDir" sudo cp -a "$tempDir/lib"/* /usr/lib64 sudo cp -a "$tempDir"/* /usr/ @@ -72,3 +77,4 @@ sudo /sbin/ldconfig # Storage version information to ~/versions.txt, which is used to print version information to provision log. echo "ICU = $icuVersion" >> ~/versions.txt + 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 |