From 4de6c12b17feeb3841318af732b171823ae1ed58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 27 Nov 2018 15:39:56 +0200 Subject: Don't set http_proxy in its own subshell The subshell actually meant, that the http_proxy environment variable was never seen outside that check. Thus proxy was never used where this was checked. Change-Id: I069f43f13dffca98d8b60a47c2e105209018c84d Reviewed-by: Oswald Buddenhagen --- coin/provisioning/common/unix/check_and_set_proxy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin/provisioning') diff --git a/coin/provisioning/common/unix/check_and_set_proxy.sh b/coin/provisioning/common/unix/check_and_set_proxy.sh index 8ada72ab..1c33641a 100755 --- a/coin/provisioning/common/unix/check_and_set_proxy.sh +++ b/coin/provisioning/common/unix/check_and_set_proxy.sh @@ -37,4 +37,4 @@ set -ex # shellcheck source=../shared/http_proxy.txt source "${BASH_SOURCE%/*}/../shared/http_proxy.txt" -(wget -q -e "http_proxy=$proxy" --spider proxy.intra.qt.io && echo "Setting http_proxy to $proxy" && export http_proxy=$proxy) || echo "Proxy not detected at $proxy" +{ wget -q -e "http_proxy=$proxy" --spider proxy.intra.qt.io && echo "Setting http_proxy to $proxy" && export http_proxy=$proxy; } || echo "Proxy not detected at $proxy" -- cgit v1.2.3