diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-04-17 14:14:37 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-04-17 14:15:23 +0200 |
| commit | 4d4159f7b7edf6d9b770a2380a7c32b219873e5d (patch) | |
| tree | ac8eeba8f9a463739ad7cdc6ea73b0300c754aaf /coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh | |
| parent | 24e1a15d40c02d5cd47644d37f713182830dfb4f (diff) | |
| parent | 6a06c4b4fe7fad6595252ac035fc0c05627b62c6 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.11.0
Change-Id: Id0540cee408413b7f5ab7410f3d1db3f38fd46af
Diffstat (limited to 'coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh')
| -rwxr-xr-x | coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh index fc07e6fa..99612260 100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh @@ -35,8 +35,10 @@ set -ex +# shellcheck source=../common/unix/check_and_set_proxy.sh source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" +# shellcheck disable=SC2031 if [ "$http_proxy" != "" ]; then echo "proxy=$proxy" | sudo tee -a /etc/yum.conf fi |