Changed KARAF_HOME to KARAF_ROOT as it was conflicting with KARAF's own and emitting annoying warnings.
Change-Id: I982701bd1ae9ecbb3c354cddf2f765b9569b02b9
diff --git a/tools/dev/bash_profile b/tools/dev/bash_profile
index 15f6389..a10b7f9 100644
--- a/tools/dev/bash_profile
+++ b/tools/dev/bash_profile
@@ -19,13 +19,13 @@
export MAVEN=${MAVEN:-~/Applications/apache-maven-3.2.2}
export KARAF_VERSION=${KARAF_VERSION:-3.0.2}
-export KARAF_HOME=${KARAF:-~/Applications/apache-karaf-$KARAF_VERSION}
-export KARAF_LOG=$KARAF_HOME/data/log/karaf.log
+export KARAF_ROOT=${KARAF_ROOT:-~/Applications/apache-karaf-$KARAF_VERSION}
+export KARAF_LOG=$KARAF_ROOT/data/log/karaf.log
# Setup a path
export PATH="$PATH:$ONOS_ROOT/tools/dev/bin:$ONOS_ROOT/tools/test/bin"
export PATH="$PATH:$ONOS_ROOT/tools/build"
-export PATH="$PATH:$MAVEN/bin:$KARAF_HOME/bin"
+export PATH="$PATH:$MAVEN/bin:$KARAF_ROOT/bin"
# Convenience utility to warp to various ONOS source projects
# e.g. 'o api', 'o dev', 'o'
diff --git a/tools/dev/onos.cshrc b/tools/dev/onos.cshrc
index 22af71d..53f8624 100644
--- a/tools/dev/onos.cshrc
+++ b/tools/dev/onos.cshrc
@@ -29,13 +29,13 @@
if ( ! $?KARAF_VERSION ) then
setenv KARAF_VERSION 3.0.2
endif
-if ( ! $?KARAF_HOME ) then
- setenv KARAF_HOME $HOME/Applications/apache-karaf-$KARAF_VERSION
+if ( ! $?KARAF_ROOT ) then
+ setenv KARAF_ROOT $HOME/Applications/apache-karaf-$KARAF_VERSION
endif
-setenv KARAF_LOG $KARAF_HOME/data/log/karaf.log
+setenv KARAF_LOG $KARAF_ROOT/data/log/karaf.log
alias onos-setup-cell ' ( env ONOS_CELL=\!^ $ONOS_ROOT/tools/test/bin/onos-show-cell \!^ ) && setenv ONOS_CELL \!^'
set path=( $path $ONOS_ROOT/tools/dev/bin $ONOS_ROOT/tools/test/bin )
set path=( $path $ONOS_ROOT/tools/build )
-set path=( $path $KARAF_HOME/bin )
+set path=( $path $KARAF_ROOT/bin )