diff options
| author | Tony Sarajärvi <tony.sarajarvi@qt.io> | 2018-03-07 15:03:07 +0200 |
|---|---|---|
| committer | Tony Sarajärvi <tony.sarajarvi@qt.io> | 2018-03-19 11:56:58 +0000 |
| commit | 90261c1df5cb62a47b44d2d9b84c0753d6ebf9e4 (patch) | |
| tree | 62ccd72268e13c4ec01e79849ad4f7b55d0c39ba /coin/provisioning/common/unix/check_and_set_proxy.sh | |
| parent | 250dd8c84eef62fbdb51856b367225adfabd643e (diff) | |
Remove try_catch codes from unix scripts
Change-Id: Iabadbf28c65132ae614048cb98e92f57e3786056
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Diffstat (limited to 'coin/provisioning/common/unix/check_and_set_proxy.sh')
| -rwxr-xr-x | coin/provisioning/common/unix/check_and_set_proxy.sh | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/coin/provisioning/common/unix/check_and_set_proxy.sh b/coin/provisioning/common/unix/check_and_set_proxy.sh index c39c7d4b..1cbee166 100755 --- a/coin/provisioning/common/unix/check_and_set_proxy.sh +++ b/coin/provisioning/common/unix/check_and_set_proxy.sh @@ -32,19 +32,8 @@ ## ############################################################################# -source "${BASH_SOURCE%/*}/try_catch.sh" -source "${BASH_SOURCE%/*}/../shared/http_proxy.txt" - -try -( - wget -q -e "http_proxy=$proxy" --spider proxy.intra.qt.io -) +set -ex -if [ $? -eq 0 ]; then - echo "Setting http_proxy to $proxy" - export http_proxy=$proxy - -else - echo "Proxy not detected at $proxy" -fi +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" |