diff options
Diffstat (limited to 'coin/provisioning/common/windows/install-jdk.ps1')
-rw-r--r-- | coin/provisioning/common/windows/install-jdk.ps1 | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/coin/provisioning/common/windows/install-jdk.ps1 b/coin/provisioning/common/windows/install-jdk.ps1 index 63e5edaf..73750489 100644 --- a/coin/provisioning/common/windows/install-jdk.ps1 +++ b/coin/provisioning/common/windows/install-jdk.ps1 @@ -38,11 +38,10 @@ $installdir = "C:\Program Files\Java\jdk1.8.0_144" $version = "8u144" -if( (is64bitWinHost) -eq 1 ) { +if (Is64BitWinHost) { $arch = "x64" $sha1 = "adb03bc3f4b40bcb3227687860798981d58e1858" -} -else { +} else { $arch = "i586" $sha1 = "3b9ab95914514eaefd72b815c5d9dd84c8e216fc" } @@ -51,13 +50,13 @@ $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\jdk-" + $version $official_url = "http://download.oracle.com/otn-pub/java/jdk/8u144-b01/090f390dda5b47b9b721c7dfaa008135/jdk-" + $version + "-windows-" + $arch + ".exe" $javaPackage = "C:\Windows\Temp\jdk-$version.exe" -echo "Fetching Java SE $version..." +Write-Host "Fetching Java SE $version..." $ProgressPreference = 'SilentlyContinue' try { - echo "...from local cache" + Write-Host "...from local cache" Download $url_cache $url_cache $javaPackage } catch { - echo "...from oracle.com" + Write-Host "...from oracle.com" $client = new-object System.Net.WebClient $cookie = "oraclelicense=accept-securebackup-cookie" $client.Headers.Add("Cookie", $cookie) @@ -68,11 +67,11 @@ try { Verify-Checksum $javaPackage $sha1 -cmd /c "$javaPackage /s SPONSORS=0" -echo "Cleaning $javaPackage.." -Remove-Item -Recurse -Force "$javaPackage" +Run-Executable "$javaPackage" "/s SPONSORS=0" +Write-Host "Cleaning $javaPackage.." +Remove-Item -Recurse -Force -Path "$javaPackage" -[Environment]::SetEnvironmentVariable("JAVA_HOME", "$installdir", [EnvironmentVariableTarget]::Machine) +Set-EnvironmentVariable "JAVA_HOME" "$installdir" Add-Path "$installdir\bin" -echo "Java SE = $version $arch" >> ~\versions.txt +Write-Output "Java SE = $version $arch" >> ~\versions.txt |