diff options
author | Liang Qi <liang.qi@qt.io> | 2018-04-17 14:14:37 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-04-17 14:15:23 +0200 |
commit | 4d4159f7b7edf6d9b770a2380a7c32b219873e5d (patch) | |
tree | ac8eeba8f9a463739ad7cdc6ea73b0300c754aaf /coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh | |
parent | 24e1a15d40c02d5cd47644d37f713182830dfb4f (diff) | |
parent | 6a06c4b4fe7fad6595252ac035fc0c05627b62c6 (diff) |
Merge remote-tracking branch 'origin/5.11' into 5.11.0
Change-Id: Id0540cee408413b7f5ab7410f3d1db3f38fd46af
Diffstat (limited to 'coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh')
-rwxr-xr-x | coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh | 19 |
1 files changed, 10 insertions, 9 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 e4492eb0..67c17954 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 @@ -45,27 +45,28 @@ function Install7ZPackageFromURL { expectedSha1=$2 targetDirectory=$3 - targetFile=`mktemp` - wget --tries=5 --waitretry=5 --output-document=$targetFile $url + targetFile=$(mktemp) + wget --tries=5 --waitretry=5 --output-document="$targetFile" "$url" echo "$expectedSha1 $targetFile" | sha1sum --check - sudo /usr/local/bin/7z x -yo$targetDirectory $targetFile - rm $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" +Install7ZPackageFromURL "$baseBinaryPackageURL" "$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" -tempDir=`mktemp -d` +tempDir=$(mktemp -d) +# shellcheck disable=SC2064 trap "sudo rm -fr $tempDir" EXIT -Install7ZPackageFromURL $develPackageURL $sha1Dev $tempDir -sudo cp -a $tempDir/lib/* /usr/lib64 -sudo cp -a $tempDir/* /usr/ +Install7ZPackageFromURL "$develPackageURL" "$sha1Dev" "$tempDir" +sudo cp -a "$tempDir/lib"/* /usr/lib64 +sudo cp -a "$tempDir"/* /usr/ sudo /sbin/ldconfig |