[karaf] branch master updated: [KARAF-5467]more fix

[ff...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/master by this push:
     new 94cd1e0  [KARAF-5467]more fix
94cd1e0 is described below

commit 94cd1e0b096fc4b1c6972107ef7c8f15df4afa74
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Wed Nov 8 16:27:22 2017 +0800

    [KARAF-5467]more fix
---
 .../features/base/src/main/filtered-resources/resources/bin/inc     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/assemblies/features/base/src/main/filtered-resources/resources/bin/inc b/assemblies/features/base/src/main/filtered-resources/resources/bin/inc
index 67433ae..6f2dc6c 100644
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/inc
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/inc
@@ -264,8 +264,10 @@ setupDefaults() {
     if [ "${JVM_VENDOR}" = "SUN" ]; then
         # permgen was removed in Java 8
         VERSION=$("${JAVA}" -version 2>&1 | egrep '"([0-9].[0-9]\..*[0-9]).*"' | awk '{print substr($3,2,length($3)-2)}' | awk '{print substr($1, 3, 3)}' | sed -e 's;\.;;g')
-        if [ "x${VERSION}" = "x" ]; then
-            VERSION=90
+        MAJOR_VERSION=$("${JAVA}" -version 2>&1 \
+            |awk -F '"' '/version/ {print $2}')
+        if [ "${MAJOR_VERSION:0:1}" -ge "9" ]; then
+           VERSION=90
         fi
         if [ "${VERSION}" -lt "80" ]; then
             # Check some easily accessible MIN/MAX params for JVM mem usage

-- 
To stop receiving notification emails like this one, please contact
['"commits@karaf.apache.org" <co...@karaf.apache.org>'].