diff options
| author | Heikki Halmet <heikki.halmet@qt.io> | 2018-03-12 14:51:29 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-04-18 18:15:00 +0000 |
| commit | 6ef6267ab9e6ef2f7c74f81f9b73c3c68594ec82 (patch) | |
| tree | 31d59cc74af3e129ffc0e2ac4518488d21f5433d /coin | |
| parent | fb55d5bc14af9dd1f3cc903a00e93f1db53bf149 (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>
(cherry picked from commit 23b4bcf6c5773f1499e89b132e87e4d0333676a7)
Reviewed-by: Heikki Halmet <heikki.halmet@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 914769f1..255af07b 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] |