diff options
| author | Heikki Halmet <heikki.halmet@qt.io> | 2018-03-12 14:51:29 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-03-15 15:07:27 +0000 |
| commit | 23b4bcf6c5773f1499e89b132e87e4d0333676a7 (patch) | |
| tree | f9cd123a00cb4c4cbb445efde6e8eedde41e03f2 /coin | |
| parent | 237b308d47c47a6959ec559e0efd2cf1b525ba3a (diff) | |
Provisioning: Move http_proxy.txt under shared folder
Change-Id: Id5b2f07a92eadfb21fbfdb3fb65621d6322dc8c4
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/provisioning/common/shared/http_proxy.txt (renamed from coin/provisioning/common/http_proxy.txt) | 0 | ||||
| -rwxr-xr-x | coin/provisioning/common/unix/check_and_set_proxy.sh | 2 | ||||
| -rw-r--r-- | coin/provisioning/common/windows/set-proxy.ps1 | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/coin/provisioning/common/http_proxy.txt b/coin/provisioning/common/shared/http_proxy.txt index 3aa6ceba..3aa6ceba 100644 --- a/coin/provisioning/common/http_proxy.txt +++ b/coin/provisioning/common/shared/http_proxy.txt diff --git a/coin/provisioning/common/unix/check_and_set_proxy.sh b/coin/provisioning/common/unix/check_and_set_proxy.sh index 38905d56..c39c7d4b 100755 --- a/coin/provisioning/common/unix/check_and_set_proxy.sh +++ b/coin/provisioning/common/unix/check_and_set_proxy.sh @@ -33,7 +33,7 @@ ############################################################################# source "${BASH_SOURCE%/*}/try_catch.sh" -source "${BASH_SOURCE%/*}/../http_proxy.txt" +source "${BASH_SOURCE%/*}/../shared/http_proxy.txt" try ( diff --git a/coin/provisioning/common/windows/set-proxy.ps1 b/coin/provisioning/common/windows/set-proxy.ps1 index 2b985b09..23c0e6aa 100644 --- a/coin/provisioning/common/windows/set-proxy.ps1 +++ b/coin/provisioning/common/windows/set-proxy.ps1 @@ -31,7 +31,7 @@ ## ############################################################################# -$n = Get-Content "$PSScriptRoot\..\http_proxy.txt" +$n = Get-Content "$PSScriptRoot\..\shared\http_proxy.txt" $n = $n.Split('=') New-Variable -Name $n[0] -Value $n[1] |