diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-20 13:53:23 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-20 13:54:12 +0100 |
| commit | 47bf73f4d0655e221371f73903cf529d60bad88e (patch) | |
| tree | 617ffe4de972090b108e5b8457c7131e1016e2d5 /coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh | |
| parent | 94ce4209567a5d4b614b932f09b43dd5286563b1 (diff) | |
| parent | 35db040229c7502a7fb834aa74a0f0925f4ac278 (diff) | |
Merge remote-tracking branch 'origin/5.10' into 5.10.0
Change-Id: I42aa9ce33260d7ea1cd51ac5ba1bf525f92d1185
Diffstat (limited to 'coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh')
| -rw-r--r-- | coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh index ad5c90d3..27c7137b 100644 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh @@ -39,7 +39,7 @@ # A copy of the patch must be in the root of the Coin path in # provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip -set -e +set -ex sha1="57a11ffe4434ad567b3c36f7b828dbb468a9e565" function InstallZipPackageFromURL { @@ -47,12 +47,12 @@ function InstallZipPackageFromURL { expectedSha1=$2 targetDirectory=$3 - targetFile=`mktemp` || echo "Failed to create temporary file" - wget --tries=5 --waitretry=5 --output-document=$targetFile $url || echo "Failed to download '$url' multiple times" - echo "$expectedSha1 $targetFile" | sha1sum --check || echo "Failed to check sha1sum" + targetFile=`mktemp` + wget --tries=5 --waitretry=5 --output-document=$targetFile $url + echo "$expectedSha1 $targetFile" | sha1sum --check - tempDir=`mktemp -d` || echo "Failed to create temporary directory" - /usr/bin/unzip -o -d $tempDir $targetFile || echo "Failed to unzip $url archive" + tempDir=`mktemp -d` + /usr/bin/unzip -o -d $tempDir $targetFile trap "sudo rm -fr $targetFile $tempDir" EXIT sudo cp -rafv $tempDir/patches/660-4367/target/* /opt/qnx660/target/ |