(fix) Uses Available KeyTool in any JRE Version

JPRuskin · JPRuskin · commit c85cd541bd89 · 2024-02-23T18:12:17.000Z
diff --git a/scripts/Get-Helpers.ps1 b/scripts/Get-Helpers.ps1
@@ -1862,7 +1862,7 @@ function Set-JenkinsCertificate {
     )
 
     $KeyStore = "C:\ProgramData\Jenkins\.jenkins\keystore.jks"
-    $KeyTool = Convert-Path "C:\Program Files\Eclipse Adoptium\jre-11.*\bin\keytool.exe"  # Using Temurin11jre package keytool
+    $KeyTool = Convert-Path "C:\Program Files\Eclipse Adoptium\jre-*.*\bin\keytool.exe"  # Using Temurin11jre package keytool
     $Passkey = [System.Net.NetworkCredential]::new(
         "JksPassword",
         (New-ServicePassword -AvailableCharacters @(48..57 + 65..90 + 97..122))

Original file line number	Diff line number	Diff line change
`@@ -1862,7 +1862,7 @@ function Set-JenkinsCertificate {`
`1862`	`1862`	`)`
`1863`	`1863`
`1864`	`1864`	`$KeyStore = "C:\ProgramData\Jenkins\.jenkins\keystore.jks"`
`1865`		`- $KeyTool = Convert-Path "C:\Program Files\Eclipse Adoptium\jre-11.*\bin\keytool.exe" # Using Temurin11jre package keytool`
	`1865`	`+ $KeyTool = Convert-Path "C:\Program Files\Eclipse Adoptium\jre-.\bin\keytool.exe" # Using Temurin11jre package keytool`
`1866`	`1866`	`$Passkey = [System.Net.NetworkCredential]::new(`
`1867`	`1867`	`"JksPassword",`
`1868`	`1868`	`(New-ServicePassword -AvailableCharacters @(48..57 + 65..90 + 97..122))`