X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=karaf%2Fopendaylight-karaf-resources%2Fsrc%2Fmain%2Fresources%2Fbin%2Fkaraf;h=99eddab1eb94dd866d67afd1d14f147a2e28ff57;hp=58392996e947ee293291b1039787acf582615ff2;hb=0eda999492644870f55582837e469ee3b3729e5d;hpb=ddeacdd4072121c423f478316c5cc00192f9312b diff --git a/karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf b/karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf index 58392996e9..99eddab1eb 100755 --- a/karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf +++ b/karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with @@ -16,8 +16,12 @@ # limitations under the License. # -DIRNAME=`dirname "$0"` -PROGNAME=`basename "$0"` +REALNAME=`readlink -e "$0"` +if [ $? != 0 ]; then + REALNAME=$0 +fi +DIRNAME=`dirname "$REALNAME"` +PROGNAME=`basename "$REALNAME"` # # Sourcing environment settings for karaf similar to tomcats setenv @@ -194,9 +198,9 @@ locateJava() { [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` fi - if [ "x$JAVA_HOME" = "x" ] && [ "$darwin" = "true" ]; then - JAVA_HOME="$(/usr/libexec/java_home -v 1.8)" - fi + if [ "x$JAVA_HOME" = "x" ] && [ "$darwin" = "true" ]; then + JAVA_HOME="$(/usr/libexec/java_home -v 1.8)" + fi if [ "x$JAVA" = "x" ] && [ -r /etc/gentoo-release ] ; then JAVA_HOME=`java-config --jre-home` fi @@ -237,7 +241,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 "80" ]; then echo "JVM must be 1.8.0 or greater"