Unset JAVA_HOME, use correct Karaf
Change-Id: Ia62e4fcc2025891621a43e18428ad3efbc4e8c65
diff --git a/opt-setup.sh b/opt-setup.sh
index 65610a5..7c75267 100644
--- a/opt-setup.sh
+++ b/opt-setup.sh
@@ -26,7 +26,7 @@
Name=ONOS
Name[en_US]=ONOS
Icon=konsole
-Exec=/usr/bin/lxterminal -t 'ONOS' -e 'sudo -u tutorial1 /opt/onos/apache-karaf-3.0.2/bin/karaf clean'
+Exec=/usr/bin/lxterminal -t 'ONOS' -e 'Applications/apache-karaf-3.0.2/bin/karaf clean'
Comment[en_US]=
EOF
@@ -143,6 +143,8 @@
export JAVA_HOME=""
cd onos && mvn clean install && mvn dependency:go-offline && cd -
+cp onos/tools/package/branding/target/onos-branding-1.0.0.jar Applications/apache-karaf-3.0.2/lib/
+
# Configure cell
cat << EOF >> onos/tools/test/cells/optical
export ONOS_NIC=127.0.0.*
@@ -153,6 +155,7 @@
EOF
# Setup profile
+echo "unset JAVA_HOME" >> ~/.profile
echo "source $ONOS_ROOT/tools/dev/bash_profile" >> ~/.profile
echo "sudo service onos stop > /dev/null 2>&1" >> ~/.profile
echo "cell optical > /dev/null 2>&1" >> ~/.profile