Skip to content

Fix compatibility with Powershell 5.1 #419

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mgaffigan merged 1 commit into from
Aug 26, 2026
Merged

Fix compatibility with Powershell 5.1 #419

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions server/basedir-includes/oieserver.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,10 @@ function Test-IsValidJavaVersion([string] $JavaCmd) {
# Execute 'java -version' and capture the output from stderr
# Example output: openjdk version "17.0.2" 2022-07-19
try {
$versionOutput = & $JavaCmd -version 2>&1
$versionOutput = & {
$ErrorActionPreference = 'Continue';
& $JavaCmd -version 2>&1 | Out-String;
};
}
catch {
return $false
Expand Down Expand Up @@ -242,7 +245,10 @@ if (-not $FinalJavaCmd -and -not [string]::IsNullOrWhiteSpace($script:VmOptionsJ
}

# Check JAVA_HOME (no fail-fast).
if (-not $FinalJavaCmd -and (Test-Path -Path $env:JAVA_HOME -PathType Container)) {
if (-not $FinalJavaCmd `
-and -not [string]::IsNullOrWhiteSpace($env:JAVA_HOME) `
-and (Test-Path -Path $env:JAVA_HOME -PathType Container)
) {
$javaHomePath = Join-Path -Path (Join-Path -Path $env:JAVA_HOME -ChildPath "bin") -ChildPath "java"
if (Test-IsValidJavaVersion -JavaCmd $javaHomePath) {
Write-Host "Info: Found suitable java version specified by the JAVA_HOME environment variable" -ForegroundColor Green
Expand Down
Loading