diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-04-15 13:53:54 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-04-15 13:53:54 +0000 |
| commit | 2516fa4583d4cef9f5eea2216fb79def5cb5fe57 (patch) | |
| tree | aeb2c0c296a504ea469ffdd080bfe8f2d1b0e1d2 /setup_native | |
| parent | 2669ce5a517b5405abf03c3d67c4f33a17784cdf (diff) | |
INTEGRATION: CWS native141 (1.6.56); FILE MERGED
2008/04/09 12:26:27 is 1.6.56.1: #i88049# new java -version output from java 1.6
Diffstat (limited to 'setup_native')
| -rw-r--r-- | setup_native/scripts/javaloader.sh | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/setup_native/scripts/javaloader.sh b/setup_native/scripts/javaloader.sh index 2cde7b9347de..1bd7e5101e1a 100644 --- a/setup_native/scripts/javaloader.sh +++ b/setup_native/scripts/javaloader.sh @@ -400,6 +400,18 @@ check_jre_version() break fi done + + # check new version format, where version number is not part of line 3 (1.6) + if [ ! "$java_runtime_sufficient" = "yes" ]; then + javaoutput=`$java_runtime -version 2>&1 | head ${tail_args} -3` + for i in $java_versions_supported; do + versionmatch=`echo $javaoutput | grep $i` + if [ ! -z "$versionmatch" ]; then + java_runtime_sufficient="yes" + break + fi + done + fi fi } |