diff options
| author | Tony Sarajärvi <tony.sarajarvi@qt.io> | 2018-02-26 10:16:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-05-02 19:01:44 +0000 |
| commit | b1c3eeb2135a235c0c03c6a1352bfb8f90a47eea (patch) | |
| tree | 75de8e58006acbd9026f8914f66ea4b95f16dc87 | |
| parent | c7562fa8ef8f0d01709527238f4c53669e1e53ff (diff) | |
Fix styles in setting proxy
Change-Id: Iac4243e767a7cfb29b9bb0b4603ca6509356ce8c
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| -rw-r--r-- | coin/provisioning/common/shared/http_proxy.txt | 2 | ||||
| -rw-r--r-- | coin/provisioning/common/windows/set-proxy.ps1 | 2 | ||||
| -rw-r--r-- | coin/provisioning/common/windows/unset-proxy.ps1 | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/coin/provisioning/common/shared/http_proxy.txt b/coin/provisioning/common/shared/http_proxy.txt index 3aa6ceba..88d0e630 100644 --- a/coin/provisioning/common/shared/http_proxy.txt +++ b/coin/provisioning/common/shared/http_proxy.txt @@ -1,2 +1,2 @@ -proxy="http://proxy.intra.qt.io:3128" +proxy=http://proxy.intra.qt.io:3128 diff --git a/coin/provisioning/common/windows/set-proxy.ps1 b/coin/provisioning/common/windows/set-proxy.ps1 index 23c0e6aa..08d6a204 100644 --- a/coin/provisioning/common/windows/set-proxy.ps1 +++ b/coin/provisioning/common/windows/set-proxy.ps1 @@ -35,7 +35,7 @@ $n = Get-Content "$PSScriptRoot\..\shared\http_proxy.txt" $n = $n.Split('=') New-Variable -Name $n[0] -Value $n[1] -if (([string]::IsNullOrEmpty($proxy)) -or ($proxy -eq '""')) { +if ([string]::IsNullOrEmpty($proxy)) { Write-Host "No proxy is defined." } else { Write-Host "Checking proxy @ $proxy" diff --git a/coin/provisioning/common/windows/unset-proxy.ps1 b/coin/provisioning/common/windows/unset-proxy.ps1 index d0a374ef..9c3dddb3 100644 --- a/coin/provisioning/common/windows/unset-proxy.ps1 +++ b/coin/provisioning/common/windows/unset-proxy.ps1 @@ -32,6 +32,8 @@ ############################################################################# Write-Host "Disabling proxy" +# A bit-mask is needed to disable "Automatically detect settings" from LAN +# settings that disturb and re-enable proxy even after disabling it. $dcs = (Get-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings\Connections").DefaultConnectionSettings $dcs[8] = $_ -band 0xF7 Set-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings\Connections" -Name DefaultConnectionSettings -Value $dcs |