Repository: karaf Updated Branches: refs/heads/master 071047f46 -> b6dd89383
[KARAF-2830] Set the Java version check more "flexible" Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/b6dd8938 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/b6dd8938 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/b6dd8938 Branch: refs/heads/master Commit: b6dd8938315f9d6e495e57608ce635fc324bb7a3 Parents: 071047f Author: Jean-Baptiste Onofré <jbono...@apache.org> Authored: Thu Jul 10 17:04:13 2014 +0200 Committer: Jean-Baptiste Onofré <jbono...@apache.org> Committed: Thu Jul 10 17:04:13 2014 +0200 ---------------------------------------------------------------------- .../framework/src/main/filtered-resources/resources/bin/karaf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/b6dd8938/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf ---------------------------------------------------------------------- diff --git a/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf b/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf index 02a5f3b..00a0770 100755 --- a/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf +++ b/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf @@ -237,7 +237,7 @@ detectJVM() { checkJvmVersion() { # echo "`$JAVA -version`" - 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'` + 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'` # echo $VERSION if [ "$VERSION" -lt "60" ]; then echo "JVM must be greater than 1.6"
