diff options
author | Liang Qi <liang.qi@qt.io> | 2019-05-03 10:10:23 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-05-03 10:10:23 +0200 |
commit | ff8220f9f67ce7aa166a083d50d937578ab6a9db (patch) | |
tree | 320f7b362b0f59c382546fc98172cc61c811ce95 /coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh | |
parent | 38b6cbfd4261433548674aa4d109fff8a007c636 (diff) | |
parent | 577d01e9dfaa9e69608097c550bd1877b5a9b735 (diff) |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
.gitmodules
coin/platform_configs/default.txt
coin/platform_configs/qt5.txt
coin/platform_configs/qtbase.txt
Change-Id: Ib25154566eb6da77f091d8f112cc1248cac9eb16
Diffstat (limited to 'coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh')
-rwxr-xr-x | coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh index addfb673..e86870c0 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh @@ -124,7 +124,8 @@ sudo pip install virtualenv wheel sudo /usr/local/bin/pip3 install wheel # Install all needed packages in a special wheel cache directory -/usr/local/bin/pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt +/usr/local/bin/pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt" +# shellcheck source=../common/unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels" |