Check jdk is correctly installed (#40550)

sebastienros · web-flow · commit 8b62081d4b30 · 2022-03-08T19:34:17.000Z
diff --git a/eng/scripts/InstallJdk.ps1 b/eng/scripts/InstallJdk.ps1
@@ -19,13 +19,14 @@ Set-StrictMode -Version 1
 
 $repoRoot = Resolve-Path "$PSScriptRoot\..\.."
 $installDir = "$repoRoot\.tools\jdk\win-x64\"
+$javacExe = "$installDir\bin\javac.exe"
 $tempDir = "$repoRoot\obj"
 if (-not $JdkVersion) {
     $globalJson = Get-Content "$repoRoot\global.json" | ConvertFrom-Json
     $JdkVersion = $globalJson.tools.jdk
 }
 
-if (Test-Path $installDir) {
+if (Test-Path $javacExe) {
     if ($Force) {
         Remove-Item -Force -Recurse $installDir
     }

Original file line number	Diff line number	Diff line change
`@@ -19,13 +19,14 @@ Set-StrictMode -Version 1`
`19`	`19`
`20`	`20`	`$repoRoot = Resolve-Path "$PSScriptRoot\..\.."`
`21`	`21`	`$installDir = "$repoRoot\.tools\jdk\win-x64\"`
	`22`	`+$javacExe = "$installDir\bin\javac.exe"`
`22`	`23`	`$tempDir = "$repoRoot\obj"`
`23`	`24`	`if (-not $JdkVersion) {`
`24`	`25`	`$globalJson = Get-Content "$repoRoot\global.json" \| ConvertFrom-Json`
`25`	`26`	`$JdkVersion = $globalJson.tools.jdk`
`26`	`27`	`}`
`27`	`28`
`28`		`-if (Test-Path $installDir) {`
	`29`	`+if (Test-Path $javacExe) {`
`29`	`30`	`if ($Force) {`
`30`	`31`	`Remove-Item -Force -Recurse $installDir`
`31`	`32`	`}`