diff options
author | Liang Qi <liang.qi@qt.io> | 2018-01-19 09:56:46 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-01-19 09:56:46 +0100 |
commit | 45528e68740a225cd3cb9dc116aca2c2b452bd23 (patch) | |
tree | f87e247e7ea71d3afe691a8a2999248979d8f1e1 /coin/provisioning/common | |
parent | 21e734438986ab73647d966a1058959c002e760c (diff) | |
parent | 786be66eaf2bf35c75ca534930cbc87c52634e8d (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I0fdced87d2064e8459fa0b9c4e16a53c1f44ac0a
Diffstat (limited to 'coin/provisioning/common')
-rw-r--r-- | coin/provisioning/common/windows/disable-windows-updates.ps1 | 21 | ||||
-rw-r--r-- | coin/provisioning/common/windows/install-notepad++.ps1 | 7 |
2 files changed, 20 insertions, 8 deletions
diff --git a/coin/provisioning/common/windows/disable-windows-updates.ps1 b/coin/provisioning/common/windows/disable-windows-updates.ps1 index 1a014733..05215e20 100644 --- a/coin/provisioning/common/windows/disable-windows-updates.ps1 +++ b/coin/provisioning/common/windows/disable-windows-updates.ps1 @@ -33,5 +33,22 @@ # This script disables the automatic Windows updates -stop-service wuauserv -set-service wuauserv –startup disabled +$service = get-service wuauserv +if (-not $service) { + Write-Host "Windows Update service not found." + exit 0 +} + +if ($service.Status -eq "Stopped") { + Write-Host "Windows Update service already stopped." +} else { + Write-Host "Stopping Windows Update service." + stop-service wuauserv +} + +$startup = Get-WmiObject Win32_Service | Where-Object {$_.Name -eq "wuauserv"} | Select -ExpandProperty "StartMode" +if ($startup -ne "Disabled") { + set-service wuauserv -startup disabled +} else { + Write-Host "Windows Update service startup already disabled." +} diff --git a/coin/provisioning/common/windows/install-notepad++.ps1 b/coin/provisioning/common/windows/install-notepad++.ps1 index a6e20d5e..4fad6f6d 100644 --- a/coin/provisioning/common/windows/install-notepad++.ps1 +++ b/coin/provisioning/common/windows/install-notepad++.ps1 @@ -57,11 +57,6 @@ Remove-Item -Recurse -Force "$nppPackage" echo "Notepad++ = $version" >> ~\versions.txt -if( (is64bitWinHost) -eq 1 ) { - Rename-Item -Path "C:\Program Files (x86)\Notepad++\updater" -NewName "updater_disabled" -} -else { - Rename-Item -Path "C:\Program Files\Notepad++\updater" -NewName "updater_disabled" -} +Rename-Item -Path "C:\Program Files\Notepad++\updater" -NewName "updater_disabled" echo "Auto-updating disabled." |