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 | |
| parent | textproc/py-pikepdf: Update to 1.6.1 (diff) | |
Fixes to pkg-install and version handling
* In pkg-install, fix the exclusion of the bootstrap directories. [1]
* In pkg-install, fix the find expression so it actually finds jdks if
there are multiple present. [1]
* When determining the VM version, be better about ensuring we end up
with only a number.
PR: 239705 [1]
Submitted by: John Hein <jcfyecrayz@liamekaens.com> [1]
Notes
Notes:
svn path=/head/; revision=508503
Diffstat (limited to 'java')
| -rw-r--r-- | java/javavmwrapper/Makefile | 2 | ||||
| -rw-r--r-- | java/javavmwrapper/files/pkg-install.in | 9 | ||||
| -rw-r--r-- | java/javavmwrapper/src/javavmwrapper.sh | 16 |
3 files changed, 17 insertions, 10 deletions
diff --git a/java/javavmwrapper/Makefile b/java/javavmwrapper/Makefile index 585455da3501..ca8f2ee07ce5 100644 --- a/java/javavmwrapper/Makefile +++ b/java/javavmwrapper/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= javavmwrapper -PORTVERSION= 2.7.2 +PORTVERSION= 2.7.3 CATEGORIES= java MASTER_SITES= # none DISTFILES= # none diff --git a/java/javavmwrapper/files/pkg-install.in b/java/javavmwrapper/files/pkg-install.in index dde5ad143032..aab50822f072 100644 --- a/java/javavmwrapper/files/pkg-install.in +++ b/java/javavmwrapper/files/pkg-install.in @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/java/javavmwrapper/files/pkg-install.in,v 1.3 2006-06-03 17:32:24 glewis Exp $ +# $FreeBSD$ LOCALBASE=%%LOCALBASE%% @@ -10,16 +10,19 @@ if [ "x${2}" != "xPOST-INSTALL" ]; then fi # Ensure all JDKs and JREs are installed -_excl_dirs='bootstrap-openjdk' +jdirs=$(cd "${LOCALBASE}" && find *jdk* *jre* -depth 0 -type d 2> /dev/null) +set -o noglob +_excl_dirs='bootstrap-openjdk.*' _find_expr='-depth 2 -regex .*/bin/java' for dir in ${_excl_dirs}; do _find_expr="${_find_expr} ! -regex ${dir}/bin/java" done -for jvm in `cd "${LOCALBASE}" && find *jdk* *jre* ${_find_expr} 2> /dev/null`; do +for jvm in `cd "${LOCALBASE}" && find $jdirs ${_find_expr} 2> /dev/null`; do if [ -x "${LOCALBASE}/${jvm}" ]; then "${PKG_PREFIX}"/bin/registervm "${LOCALBASE}/${jvm}" > /dev/null 2>&1 fi done +set +o noglob # Ensure all VMs are configured correctly "${PKG_PREFIX}"/bin/checkvms 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= |