summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2019-02-07 09:27:45 +0100
committerLiang Qi <liang.qi@qt.io>2019-02-07 09:31:51 +0100
commit84aa9b73ad29f020271a9a57cea88ae7cc2a6abe (patch)
treef6ac36295d57881c0d59a2f9f304007e68c111f3
parent73f1d0f518f28fd4db27c3e2517d3448d0ba6b65 (diff)
parent1830cca2bce0bc0c1d7a52a026757d7fb92d772e (diff)
Merge remote-tracking branch 'origin/dev' into 5.13
-rw-r--r--coin/provisioning/common/windows/unset-proxy.ps19
-rw-r--r--coin/provisioning/qtci-windows-10-x86/01-disable-windefender.ps1 (renamed from coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1)0
-rw-r--r--coin/provisioning/qtci-windows-10-x86/01-disable-windows-updates.ps1 (renamed from coin/provisioning/qtci-windows-10-x86/04-disable-windows-updates.ps1)0
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/01-disable-windows-updates.ps1 (renamed from coin/provisioning/qtci-windows-10-x86_64/04-disable-windows-updates.ps1)0
4 files changed, 7 insertions, 2 deletions
diff --git a/coin/provisioning/common/windows/unset-proxy.ps1 b/coin/provisioning/common/windows/unset-proxy.ps1
index 9c3dddb3..0b7d761f 100644
--- a/coin/provisioning/common/windows/unset-proxy.ps1
+++ b/coin/provisioning/common/windows/unset-proxy.ps1
@@ -38,6 +38,11 @@ $dcs = (Get-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\
$dcs[8] = $_ -band 0xF7
Set-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings\Connections" -Name DefaultConnectionSettings -Value $dcs
Set-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings" -Name ProxyEnable -Value 0
-Remove-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings" -Name ProxyServer
-Remove-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings" -Name ProxyOverride
+if(Get-ItemProperty -ErrorAction SilentlyContinue -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings" -Name ProxyServer){
+ Remove-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings" -Name ProxyServer
+
+}
+if(Get-ItemProperty -ErrorAction SilentlyContinue -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings" -Name ProxyOverride){
+ Remove-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings" -Name ProxyOverride
+}
diff --git a/coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-10-x86/01-disable-windefender.ps1
index 8f94b3d5..8f94b3d5 100644
--- a/coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/01-disable-windefender.ps1
diff --git a/coin/provisioning/qtci-windows-10-x86/04-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-10-x86/01-disable-windows-updates.ps1
index 57428310..57428310 100644
--- a/coin/provisioning/qtci-windows-10-x86/04-disable-windows-updates.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/01-disable-windows-updates.ps1
diff --git a/coin/provisioning/qtci-windows-10-x86_64/04-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-disable-windows-updates.ps1
index 57428310..57428310 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/04-disable-windows-updates.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/01-disable-windows-updates.ps1