diff options
author | Liang Qi <liang.qi@qt.io> | 2018-04-29 20:25:03 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-04-29 20:25:03 +0200 |
commit | 6840a639ec015d153b7eecf1661e233197d75d4b (patch) | |
tree | d99c7c51712056b1ca59fc7c5a9e5d5ff96b165e /coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh | |
parent | cddb2254c3232837380812ee30d9eb1c75039d08 (diff) | |
parent | 889cdbf4a8f90e7580f55d341006f49f12f9b9c7 (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I02bb2ecd3b1121255d885082023f24412284b445
Diffstat (limited to 'coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh')
-rwxr-xr-x | coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh index 053adfe1..0e677642 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh @@ -3,7 +3,9 @@ set -ex BASEDIR=$(dirname "$0") -source $BASEDIR/../common/shared/network_test_server_ip.txt +# shellcheck source=../common/shared/network_test_server_ip.txt +source "$BASEDIR/../common/shared/network_test_server_ip.txt" +# shellcheck source=../common/unix/check_and_set_proxy.sh source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" sed -i '$ a\[Daemon\]\nAutolock=false\nLockOnResume=false' ~/.config/kscreenlockerrc @@ -17,6 +19,7 @@ sudo balooctl disable echo "Disable update notifications" sudo zypper -nq remove plasma5-pk-updates +# shellcheck disable=SC2031 if [ "$http_proxy" != "" ]; then sudo sed -i 's/PROXY_ENABLED=\"no\"/PROXY_ENABLED=\"yes\"/' /etc/sysconfig/proxy sudo sed -i "s|HTTP_PROXY=\".*\"|HTTP_PROXY=\"$proxy\"|" /etc/sysconfig/proxy |