1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00

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.
This commit is contained in:
Greg Lewis 2019-07-26 21:47:09 +00:00
parent c2f56bce41
commit 587ee3db52
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=507376
2 changed files with 7 additions and 5 deletions

View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= javavmwrapper
PORTVERSION= 2.7.1
PORTVERSION= 2.7.2
CATEGORIES= java
MASTER_SITES= # none
DISTFILES= # none

View File

@ -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