홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
255b65fd 1 parent c0050f97

Changed KARAF_HOME to KARAF_ROOT as it was conflicting with KARAF's own and emit… 

…ting annoying warnings.

Change-Id: I982701bd1ae9ecbb3c354cddf2f765b9569b02b9
Inline Side-by-side
Showing 2 changed files with 7 additions and 7 deletions
...@@ -19,13 +19,13 @@ fi ...@@ -19,13 +19,13 @@ fi
19 export MAVEN=${MAVEN:-~/Applications/apache-maven-3.2.2} 19 export MAVEN=${MAVEN:-~/Applications/apache-maven-3.2.2}
20 20
21 export KARAF_VERSION=${KARAF_VERSION:-3.0.2} 21 export KARAF_VERSION=${KARAF_VERSION:-3.0.2}
22 -export KARAF_HOME=${KARAF:-~/Applications/apache-karaf-$KARAF_VERSION} 22 +export KARAF_ROOT=${KARAF_ROOT:-~/Applications/apache-karaf-$KARAF_VERSION}
23 -export KARAF_LOG=$KARAF_HOME/data/log/karaf.log 23 +export KARAF_LOG=$KARAF_ROOT/data/log/karaf.log
24 24
25 # Setup a path 25 # Setup a path
26 export PATH="$PATH:$ONOS_ROOT/tools/dev/bin:$ONOS_ROOT/tools/test/bin" 26 export PATH="$PATH:$ONOS_ROOT/tools/dev/bin:$ONOS_ROOT/tools/test/bin"
27 export PATH="$PATH:$ONOS_ROOT/tools/build" 27 export PATH="$PATH:$ONOS_ROOT/tools/build"
28 -export PATH="$PATH:$MAVEN/bin:$KARAF_HOME/bin" 28 +export PATH="$PATH:$MAVEN/bin:$KARAF_ROOT/bin"
29 29
30 # Convenience utility to warp to various ONOS source projects 30 # Convenience utility to warp to various ONOS source projects
31 # e.g. 'o api', 'o dev', 'o' 31 # e.g. 'o api', 'o dev', 'o'
......
...@@ -29,13 +29,13 @@ endif ...@@ -29,13 +29,13 @@ endif
29 if ( ! $?KARAF_VERSION ) then 29 if ( ! $?KARAF_VERSION ) then
30 setenv KARAF_VERSION 3.0.2 30 setenv KARAF_VERSION 3.0.2
31 endif 31 endif
32 -if ( ! $?KARAF_HOME ) then 32 +if ( ! $?KARAF_ROOT ) then
33 - setenv KARAF_HOME $HOME/Applications/apache-karaf-$KARAF_VERSION 33 + setenv KARAF_ROOT $HOME/Applications/apache-karaf-$KARAF_VERSION
34 endif 34 endif
35 -setenv KARAF_LOG $KARAF_HOME/data/log/karaf.log 35 +setenv KARAF_LOG $KARAF_ROOT/data/log/karaf.log
36 36
37 alias onos-setup-cell ' ( env ONOS_CELL=\!^ $ONOS_ROOT/tools/test/bin/onos-show-cell \!^ ) && setenv ONOS_CELL \!^' 37 alias onos-setup-cell ' ( env ONOS_CELL=\!^ $ONOS_ROOT/tools/test/bin/onos-show-cell \!^ ) && setenv ONOS_CELL \!^'
38 38
39 set path=( $path $ONOS_ROOT/tools/dev/bin $ONOS_ROOT/tools/test/bin ) 39 set path=( $path $ONOS_ROOT/tools/dev/bin $ONOS_ROOT/tools/test/bin )
40 set path=( $path $ONOS_ROOT/tools/build ) 40 set path=( $path $ONOS_ROOT/tools/build )
41 -set path=( $path $KARAF_HOME/bin ) 41 +set path=( $path $KARAF_ROOT/bin )
......