diff options
author | Tony Sarajärvi <tony.sarajarvi@qt.io> | 2018-04-11 10:12:09 +0300 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-04-15 16:40:49 +0000 |
commit | cd347c86afe3307e1b25c0301965099c1c012fc0 (patch) | |
tree | 25187bc362cee30e290957099e1854e062b1b7de /coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh | |
parent | 6df84f898459eb18d92c7adeaf8bca1817c2778b (diff) |
Fix shellcheck complaints in RHEL 6.6 provisioning scripts
Change-Id: Idb4240b4cfd309b2c6c418e8c18b175a491f8eea
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
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 |