mudhorn/oh-my-posh
1
0
Fork 0
mirror of https://github.com/JanDeDobbeleer/oh-my-posh.git synced 2025-01-13 20:27:28 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix(java): support Zulu builds

Browse source 
resolves #1202
This commit is contained in:
Jan De Dobbeleer 2021-11-10 19:54:57 +01:00 committed by Jan De Dobbeleer
parent 274f800ae2
commit 2d3b6e4e23
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/segment_java.go
View file

@ -11,7 +11,7 @@ func (j *java) string() string {
}
func (j *java) init(props *properties, env environmentInfo) {
javaRegex := `(?: JRE) \((?P<version>(?P<major>[0-9]+)(?:\.(?P<minor>[0-9]+))?(?:\.(?P<patch>[0-9]+))?).*\),`
javaRegex := `(?: JRE)(?: \(.*\))? \((?P<version>(?P<major>[0-9]+)(?:\.(?P<minor>[0-9]+))?(?:\.(?P<patch>[0-9]+))?).*\),`
javaCmd := &cmd{
executable: "java",
args: []string{"-Xinternalversion"},

5
src/segment_java_test.go
View file

@ -15,6 +15,11 @@ func TestJava(t *testing.T) {
JavaHomeVersion string
JavaHomeEnabled bool
}{
{
Case: "Zulu LTS",
ExpectedString: "11.0.13",
Version: "OpenJDK 64-Bit Server VM (11.0.13+8-LTS) for windows-amd64 JRE (Zulu11.52+13-CA) (11.0.13+8-LTS), built on Oct 7 2021 16:00:23 by \"zulu_re\" with MS VC++ 15.9 (VS2017)", // nolint:lll
},
{
Case: "OpenJDK macOS",
ExpectedString: "1.8.0",