diff options
Diffstat (limited to 'patch-jvm-version-check.patch')
| -rw-r--r-- | patch-jvm-version-check.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/patch-jvm-version-check.patch b/patch-jvm-version-check.patch index 25cce9f07548..876eca56ff43 100644 --- a/patch-jvm-version-check.patch +++ b/patch-jvm-version-check.patch @@ -1,3 +1,19 @@ +--- 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 @@ @@ -14,3 +30,34 @@ 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 + } + # |