svn commit: r507376 - in head/java/javavmwrapper: . src

[Greg Lewis]

Author: glewis
Date: Fri Jul 26 21:47:09 2019
New Revision: 507376
URL: https://svnweb.freebsd.org/changeset/ports/507376

Log:
  Sort VMs by version numerically
  
  * VMs were sorted by VM version by lexicographically sorting the version as
    a string.  Switch to numeric sorting now that there are versions like
    10, 11, and 12 so that the intended sort order (most recent first) is
    preserved.
  * Bump minor version.

Modified:
  head/java/javavmwrapper/Makefile
  head/java/javavmwrapper/src/javavmwrapper.sh

Modified: head/java/javavmwrapper/Makefile
==============================================================================
--- head/java/javavmwrapper/Makefile	Fri Jul 26 21:03:55 2019	(r507375)
+++ head/java/javavmwrapper/Makefile	Fri Jul 26 21:47:09 2019	(r507376)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	javavmwrapper
-PORTVERSION=	2.7.1
+PORTVERSION=	2.7.2
 CATEGORIES=	java
 MASTER_SITES=	# none
 DISTFILES=	# none

Modified: head/java/javavmwrapper/src/javavmwrapper.sh
==============================================================================
--- head/java/javavmwrapper/src/javavmwrapper.sh	Fri Jul 26 21:03:55 2019	(r507375)
+++ head/java/javavmwrapper/src/javavmwrapper.sh	Fri Jul 26 21:47:09 2019	(r507376)
@@ -176,14 +176,16 @@ sortConfiguration () {
             # 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]||' 2>/dev/null`
+		                      -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]||' 2>/dev/null`
-            if [ "${VERSION}" \> "${_VERSION}" ]; then
+		                        -e 's|\.[0-9]||' -e 's|-jre||' \
+					2>/dev/null`
+            if [ "${VERSION}" -gt "${_VERSION}" ]; then
                 _JAVAVMS="${_JAVAVMS}:${JAVAVM}:${_JAVAVM}"
                 JAVAVM=
                 continue
-            elif [ "${VERSION}" \< "${_VERSION}" ]; then
+            elif [ "${VERSION}" -lt "${_VERSION}" ]; then
                 _JAVAVMS="${_JAVAVMS}:${_JAVAVM}"
                 continue
             else