summarylogtreecommitdiffstats
path: root/patch-jvm-version-check.patch
blob: 876eca56ff4340768bd50739cb02925635bec2e8 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
--- package.orig/IPMIView_2.21.1_build.230720_bundleJRE_Linux_x64/iKVM
+++ package.new/IPMIView_2.21.1_build.230720_bundleJRE_Linux_x64/iKVM
@@ -871,12 +871,7 @@
 getJavaVersion()
 {
 	javaExe=$1
-	javaVersion=` "${javaExe}" -version 2>&1 | $AWK '
-$3 ~ /"[0-9]\.[0-9]\.[0-9][^"]*"$/ {
-	gsub ("[^0-9._]", "", $3)
-	print $3
-}
-	' `
+	javaVersion=` "${javaExe}" -version 2>&1 | $AWK -F '"' '/version/ {print $2}' `
 	unset javaExe
 }
 #
--- package.orig/IPMIView_2.21.1_build.230720_bundleJRE_Linux_x64/IPMIView20
+++ package.new/IPMIView_2.21.1_build.230720_bundleJRE_Linux_x64/IPMIView20
@@ -871,12 +871,7 @@
 getJavaVersion()
 {
 	javaExe=$1
-	javaVersion=` "${javaExe}" -version 2>&1 | $AWK '
-$3 ~ /"[0-9]\.[0-9]\.[0-9][^"]*"$/ {
-	gsub ("[^0-9._]", "", $3)
-	print $3
-}
-	' `
+	javaVersion=` "${javaExe}" -version 2>&1 | $AWK -F '"' '/version/ {print $2}' `
 	unset javaExe
 }
 #
--- package.orig/IPMIView_2.21.1_build.230720_bundleJRE_Linux_x64/JViewerX9
+++ package.new/IPMIView_2.21.1_build.230720_bundleJRE_Linux_x64/JViewerX9
@@ -871,10 +871,8 @@
 getJavaVersion()
 {
 	javaExe=$1
-	javaVersion=` "${javaExe}" -version 2>&1 | $AWK '
-$3 ~ /"[0-9]\.[0-9]\.[0-9][^"]*"$/ {
-	gsub ("[^0-9._]", "", $3)
-	print $3
+	javaVersion=` "${javaExe}" -version 2>&1 | $AWK -F '"' '/version/ {print $2}' `
+	unset javaExe
 }
 	' `
 	unset javaExe
--- package.orig/IPMIView_2.21.1_build.230720_bundleJRE_Linux_x64/TrapReceiver
+++ package.new/IPMIView_2.21.1_build.230720_bundleJRE_Linux_x64/TrapReceiver
@@ -871,12 +871,7 @@
 getJavaVersion()
 {
 	javaExe=$1
-	javaVersion=` "${javaExe}" -version 2>&1 | $AWK '
-$3 ~ /"[0-9]\.[0-9]\.[0-9][^"]*"$/ {
-	gsub ("[^0-9._]", "", $3)
-	print $3
-}
-	' `
+	javaVersion=` "${javaExe}" -version 2>&1 | $AWK -F '"' '/version/ {print $2}' `
 	unset javaExe
 }
 #