diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2019-08-10 19:28:18 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2019-08-10 19:28:18 +0000 |
| commit | 2d13292940dc21b831dee08ff2f390a851679b44 (patch) | |
| tree | be41f3d17b61524c1b6c8d415b8d17547a31912e /java/javavmwrapper/src | |
| parent | 0788c3ef8320baff4b493df509afe16936311628 (diff) | |
Notes
Diffstat (limited to 'java/javavmwrapper/src')
| -rw-r--r-- | java/javavmwrapper/src/javavmwrapper.sh | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/java/javavmwrapper/src/javavmwrapper.sh b/java/javavmwrapper/src/javavmwrapper.sh index e0277eb41e4a..2dc2995bf2f7 100644 --- a/java/javavmwrapper/src/javavmwrapper.sh +++ b/java/javavmwrapper/src/javavmwrapper.sh @@ -175,12 +175,16 @@ sortConfiguration () { _VM=`basename "${_VM}"` # Consistent version numbering for various install directory names # including 'openjdk6', 'jdk1.6.0', 'linux-sun-jdk1.6.0', etc. - VERSION=`echo ${VM} | sed -e 's|[^0-9]*||' -e 's|1\.||' \ - -e 's|\.[0-9]||' -e 's|-jre||' \ - 2>/dev/null` - _VERSION=`echo ${_VM} | sed -e 's|[^0-9]*||' -e 's|1\.||' \ - -e 's|\.[0-9]||' -e 's|-jre||' \ - 2>/dev/null` + VERSION=`echo ${VM} | sed -e 's|[^0-9]*||' \ + -e 's|1\.\([0-9][0-9]*\)|\1|' \ + -e 's|\([0-9][0-9]*\)\.[0-9]|\1|' \ + -e 's|[^0-9]*\([0-9][0-9]*\)[^0-9]*|\1|' + 2>/dev/null` + _VERSION=`echo ${_VM} | sed -e 's|[^0-9]*||' \ + -e 's|1\.\([0-9][0-9]*\)|\1|' \ + -e 's|\([0-9][0-9]*\)\.[0-9]|\1|' \ + -e 's|[^0-9]*\([0-9][0-9]*\)[^0-9]*|\1|' + 2>/dev/null` if [ "${VERSION}" -gt "${_VERSION}" ]; then _JAVAVMS="${_JAVAVMS}:${JAVAVM}:${_JAVAVM}" JAVAVM= |