diff options
| author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2018-01-29 13:53:08 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2018-01-29 14:06:05 +0100 |
| commit | a434f14bd93f387f5f981fcd7d27ce95384d1ce6 (patch) | |
| tree | b5cc79dd41ef6dd3c49dafcf899d469574632123 /coin/provisioning/common/linux/qnx_700.sh | |
| parent | 282899453d2c6b4c51bbd94fc228f2bb711d64f6 (diff) | |
| parent | 351a519340d509300c754d0a62771a7f6e38ea4c (diff) | |
Merge remote-tracking branch 'origin/5.10' into 5.11
Conflicts:
coin/provisioning/common/linux/qnx_700.sh
coin/provisioning/common/windows/libclang.ps1
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Change-Id: I7fe1337fb8a575083e8b649d1a051abc82e3b408
Diffstat (limited to 'coin/provisioning/common/linux/qnx_700.sh')
| -rwxr-xr-x | coin/provisioning/common/linux/qnx_700.sh | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/coin/provisioning/common/linux/qnx_700.sh b/coin/provisioning/common/linux/qnx_700.sh index 4f7c4fb1..584c91a8 100755 --- a/coin/provisioning/common/linux/qnx_700.sh +++ b/coin/provisioning/common/linux/qnx_700.sh @@ -36,6 +36,9 @@ # This script installs QNX 7. set -ex + +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" + targetFolder="/opt/" sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700.tar.xz" sha1="949a87c5f00d0756956cb4b1b3b213ecaeee9113" @@ -44,7 +47,7 @@ targetFile="qnx700.tar.xz" wget --tries=5 --waitretry=5 --output-document="$targetFile" "$sourceFile" echo "$sha1 $targetFile" | sha1sum --check if [ ! -d "$targetFolder" ]; then - mkdir -p $targetFolder + mkdir -p $targetFolder fi sudo tar -C $targetFolder -Jxf $targetFile sudo chown -R qt:users "$targetFolder"/"$folderName" @@ -58,10 +61,6 @@ fi rm -rf $targetFile # Set env variables -if uname -a |grep -q "Ubuntu"; then - echo "export QNX_700=$targetFolder$folderName" >> ~/.profile -else - echo "export QNX_700=$targetFolder$folderName" >> ~/.bashrc -fi +SetEnvVar "QNX_700" "$targetFolder$folderName" echo "QNX SDP = 7.0.0" >> ~/versions.txt |