summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeikki Halmet <heikki.halmet@qt.io>2019-11-19 09:09:21 +0200
committerHeikki Halmet <heikki.halmet@qt.io>2019-12-03 08:00:06 +0200
commit770d9d70bf5f327a9623829d18fefd88a4a74f48 (patch)
treec355b796fce7262243a079355266f2d02629496f
parenta246212aad95b9f928f24f834c06b2cdd7b77a09 (diff)
Provisioning: Change JDK script to use 'Remove' function from helpers
Task-number: QTQAINFRA-3369 Change-Id: I2e873eb50d9129c48d92370af80fe121039d172e Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit dcfef7226fb54288858d234764f15582c77f5b05) Reviewed-by: Simo Fält <simo.falt@qt.io>
-rw-r--r--coin/provisioning/common/windows/install-jdk.ps13
1 files changed, 1 insertions, 2 deletions
diff --git a/coin/provisioning/common/windows/install-jdk.ps1 b/coin/provisioning/common/windows/install-jdk.ps1
index 0c548e63..ce1abdd5 100644
--- a/coin/provisioning/common/windows/install-jdk.ps1
+++ b/coin/provisioning/common/windows/install-jdk.ps1
@@ -68,8 +68,7 @@ try {
Verify-Checksum $javaPackage $sha1
Run-Executable "$javaPackage" "/s SPONSORS=0"
-Write-Host "Cleaning $javaPackage.."
-Remove-Item -Recurse -Force -Path "$javaPackage"
+Remove "$javaPackage"
Write-Host "Remove Java update from startup"
reg delete "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Run" /v SunJavaUpdateSched /f