summarylogtreecommitdiffstats
path: root/patch-jvm-version-check.patch
diff options
context:
space:
mode:
authorZach Himsel2023-10-21 11:25:58 -0400
committerZach Himsel2023-10-21 11:25:58 -0400
commit83b172857c0a2fddaff671886e6357e7da8849f4 (patch)
tree40abc45b49353346e9c29c6f7813360ebcbbd937 /patch-jvm-version-check.patch
parent424b9269bafc0b5fe842178de8625adf0b5b3924 (diff)
downloadaur-83b172857c0a2fddaff671886e6357e7da8849f4.tar.gz
Fix getJavaVersion patch for openjdk21
Credit for the updated patch to https://aur.archlinux.org/account/MoetaYuko
Diffstat (limited to 'patch-jvm-version-check.patch')
-rw-r--r--patch-jvm-version-check.patch15
1 files changed, 10 insertions, 5 deletions
diff --git a/patch-jvm-version-check.patch b/patch-jvm-version-check.patch
index 72f44e01dc86..25cce9f07548 100644
--- a/patch-jvm-version-check.patch
+++ b/patch-jvm-version-check.patch
@@ -1,11 +1,16 @@
--- package.orig/IPMIView_2.21.1_build.230720_bundleJRE_Linux_x64/IPMIView20
+++ package.new/IPMIView_2.21.1_build.230720_bundleJRE_Linux_x64/IPMIView20
-@@ -872,7 +872,7 @@
+@@ -871,12 +871,7 @@
+ getJavaVersion()
{
javaExe=$1
- javaVersion=` "${javaExe}" -version 2>&1 | $AWK '
+- javaVersion=` "${javaExe}" -version 2>&1 | $AWK '
-$3 ~ /"[0-9]\.[0-9]\.[0-9][^"]*"$/ {
-+$3 ~ /"[0-9][0-9]?\.[0-9]\.[0-9][^"]*"$/ {
- gsub ("[^0-9._]", "", $3)
- print $3
+- gsub ("[^0-9._]", "", $3)
+- print $3
+-}
+- ' `
++ javaVersion=` "${javaExe}" -version 2>&1 | $AWK -F '"' '/version/ {print $2}' `
+ unset javaExe
}
+ #