Author: anierbeck
Date: Fri Jun 7 12:57:44 2013
New Revision: 1490625
URL: http://svn.apache.org/r1490625
Log:
[KARAF-1246] - add a version checker for karaf start script
-----
added patch supplied by Nick Smith
thanks for contributing ...
Modified:
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf
Modified:
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf
URL:
http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf?rev=1490625&r1=1490624&r2=1490625&view=diff
==============================================================================
---
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf
(original)
+++
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf
Fri Jun 7 12:57:44 2013
@@ -228,7 +228,7 @@ detectJVM() {
checkJvmVersion() {
# echo "`$JAVA -version`"
- VERSION=`$JAVA -version 2>&1 | egrep '"(\d\.\d\..*\d)"' | 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"
