X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fdistribution%2Fopendaylight%2Fsrc%2Fmain%2Fresources%2Frun.sh;h=1e903d06503c286d7a0e8b41556c826eb5d6d105;hb=48814d6a264b8f13e5db1422336d9ef25cb05fa9;hp=92ddbbd605346095bd4110118ab517e48e625756;hpb=accc07b1785811ed85038ac3c313c1d01724dc08;p=controller.git diff --git a/opendaylight/distribution/opendaylight/src/main/resources/run.sh b/opendaylight/distribution/opendaylight/src/main/resources/run.sh index 92ddbbd605..1e903d0650 100755 --- a/opendaylight/distribution/opendaylight/src/main/resources/run.sh +++ b/opendaylight/distribution/opendaylight/src/main/resources/run.sh @@ -13,7 +13,7 @@ if [[ $platform == 'linux' ]]; then if [[ -z ${JAVA_HOME} ]]; then # Find the actual location of the Java launcher: - java_launcher=`which java` + java_launcher=`command -v java` java_launcher=`readlink -f "${java_launcher}"` # Compute the Java home from the location of the Java launcher: @@ -116,7 +116,7 @@ if [ "${dohelp}" -eq 1 ]; then usage fi -if [ "${jvmMaxMemory}"=="" ]; then +if [ "${jvmMaxMemory}" == "" ]; then jvmMaxMemory="-Xmx1G" echo "*****************************************************************" echo "JVM maximum memory was not defined. Setting maximum memory to 1G." @@ -161,7 +161,7 @@ fi ######################################## # Now add to classpath the OSGi JAR ######################################## -CLASSPATH="${basedir}"/lib/org.eclipse.osgi-3.8.1.v20120830-144521.jar +CLASSPATH=${CLASSPATH}:${basedir}/lib/org.eclipse.osgi-3.8.1.v20120830-144521.jar FWCLASSPATH=file:"${basedir}"/lib/org.eclipse.osgi-3.8.1.v20120830-144521.jar ########################################