diff options
author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2018-01-22 12:19:10 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2018-01-22 12:19:10 +0100 |
commit | 052b4b5844dc793199c4d4bb6357cc656dd919b1 (patch) | |
tree | 9d4e4363f7d69dee8f2ec01e7046f67ed5907ca8 /coin/provisioning/common/windows | |
parent | dc1560dbef6715d8a22e1bee67a418c9fb0a5b81 (diff) | |
parent | b6a1e9f07e0a891cc3435f535bf01f5df8f52de8 (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: I1031266ae727e7bfeae71bf3faed9b5197c16247
Diffstat (limited to 'coin/provisioning/common/windows')
-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." |