Making it easier for cygwin users to run OpenDaylight using run.sh. 30/6630/1
authorSrini Seetharaman <srini.seetharaman@gmail.com>
Wed, 30 Apr 2014 23:51:34 +0000 (16:51 -0700)
committerSrini Seetharaman <srini.seetharaman@gmail.com>
Wed, 30 Apr 2014 23:51:34 +0000 (16:51 -0700)
With this change, the users will only have to add the following line
to their .bashrc to make it run: export CLASSPATH=".;lib/*;"

Change-Id: Ia1eae6c2feb69471198bdc6c625e2276e9b89334
Signed-off-by: Srini Seetharaman <srini.seetharaman@gmail.com>
main/src/main/resources/run.sh

index 64f2c877f7ea60f2e87f13bb9d4b173a11d7a16d..0cbb4040f5e2624fb0f4094d6861d4bdae5dde75 100755 (executable)
@@ -147,7 +147,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
 
 ########################################
@@ -229,7 +229,7 @@ elif [ "${consolestart}" -eq 1 ]; then
         echo "Another instance of controller running, check with $0 -status"
         exit -1
     fi
-    $JAVA_HOME/bin/java ${extraJVMOpts} \
+    java ${extraJVMOpts} \
         ${agentPath} \
         -Djava.io.tmpdir="${iotmpdir}/work/tmp" \
         -Dosgi.install.area="${bdir}" \