aboutsummaryrefslogtreecommitdiffstats
path: root/coin/provisioning
diff options
context:
space:
mode:
authorTony Sarajärvi <tony.sarajarvi@qt.io>2018-11-27 15:39:56 +0200
committerTony Sarajärvi <tony.sarajarvi@qt.io>2018-11-29 20:20:26 +0000
commit4de6c12b17feeb3841318af732b171823ae1ed58 (patch)
tree3584221aff30f56199bc3f1520dbfab859ec04fd /coin/provisioning
parent22e5bda9a9ca9229e307aa09a20d6547a3648319 (diff)
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 <oswald.buddenhagen@qt.io>
Diffstat (limited to 'coin/provisioning')
-rwxr-xr-xcoin/provisioning/common/unix/check_and_set_proxy.sh2
1 files changed, 1 insertions, 1 deletions
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"