diff options
author | Heikki Halmet <heikki.halmet@qt.io> | 2017-11-03 13:09:55 +0200 |
---|---|---|
committer | Tony Sarajärvi <tony.sarajarvi@qt.io> | 2017-11-07 15:25:12 +0000 |
commit | 0e278c4e95aa5d2e9df315125c119f36149fcc95 (patch) | |
tree | bdab43c4e17dc02ce2a61c8c7d3fd8384efec717 /coin/provisioning/qtci-linux-RHEL-7.4-x86_64 | |
parent | 894c63834baf28c78c87e39d25bc8940d4e35cb6 (diff) |
Provisioning: Remove logical OR when echo errors
set -e won't work if logical OR is used after commands. These error
echo's need to be removed so that error catch will works. Also set -ex
added to print executed command when error caught.
Task-number: QTQAINFRA-1533
Change-Id: Ib4ea832a0ee813f99f59ebacad51ec57c3eff57d
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/009-install_icu.sh | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-install_icu.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-install_icu.sh index b51c9c8c..9447c43f 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-install_icu.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-install_icu.sh @@ -33,7 +33,7 @@ ## ############################################################################# -set -e +set -ex # This script will install ICU @@ -47,20 +47,20 @@ develPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/ echo "Installing custom ICU $icuVersion $sha1 packages on RHEL to $icuLocation" -targetFile=`mktemp` || echo "Failed to create temporary file" -wget --tries=5 --waitretry=5 --output-document=$targetFile $baseBinaryPackageURL || echo "Failed to download '$baseBinaryPackageURL' multiple times" -echo "$sha1 $targetFile" | sha1sum --check || echo "Failed to check sha1sum" -sudo 7z x -y -o"/usr/lib64" $targetFile || echo "Failed to unzip $baseBinaryPackageURL archive" +targetFile=`mktemp` +wget --tries=5 --waitretry=5 --output-document=$targetFile $baseBinaryPackageURL +echo "$sha1 $targetFile" | sha1sum --check +sudo 7z x -y -o"/usr/lib64" $targetFile sudo rm $targetFile echo "Installing custom ICU devel packages on RHEL" -tempDir=`mktemp -d` || echo "Failed to create temporary directory" +tempDir=`mktemp -d` -targetFile=`mktemp` || echo "Failed to create temporary file" -wget --tries=5 --waitretry=5 --output-document=$targetFile $develPackageURL || echo "Failed to download '$develPackageURL' multiple times" -echo "$sha1Dev $targetFile" | sha1sum --check || echo "Failed to check sha1sum" -7z x -y -o$tempDir $targetFile || echo "Failed to unzip $develPackageURL archive" +targetFile=`mktemp` +wget --tries=5 --waitretry=5 --output-document=$targetFile $develPackageURL +echo "$sha1Dev $targetFile" | sha1sum --check +7z x -y -o$tempDir $targetFile sudo cp -a $tempDir/lib/* /usr/lib64 sudo cp -a $tempDir/* /usr/ |