commit b105fd47c332978411b1cecb1d4a1990344960bc
author Thomas Vachuska <tom@onlab.us> Mon Oct 20 09:02:27 2014 -0700
committer Thomas Vachuska <tom@onlab.us> Mon Oct 20 09:02:27 2014 -0700
tree e84f726547f68e0734bfd0f06f2067996a308387
parent aaac0d7a54f494ff05956d6f3f82232052da2de7

Tweaked packaging and related assets in preparation for Karaf 3.0.2

tools/package/bin/onos

diff --git a/tools/package/bin/onos b/tools/package/bin/onos
index 0489318..bd5059f 100755
--- a/tools/package/bin/onos
+++ b/tools/package/bin/onos
@@ -5,5 +5,5 @@
 
 export JAVA_HOME=${JAVA_HOME:-/usr/lib/jvm/java-7-openjdk-amd64/}
 
-cd $(dirname $0)/../apache-karaf-*/bin
+cd $(dirname $0)/../apache-karaf-$KARAF_VERSION/bin
 ./client -h localhost "$@"

tools/package/bin/onos-service

diff --git a/tools/package/bin/onos-service b/tools/package/bin/onos-service
index 7c8850f..299cb9a 100755
--- a/tools/package/bin/onos-service
+++ b/tools/package/bin/onos-service
@@ -7,4 +7,4 @@
 export JAVA_OPTS="-Xms256M -Xmx2048M"
 
 cd /opt/onos
-/opt/onos/apache-karaf-3.0.1/bin/karaf "$@"
+/opt/onos/apache-karaf-$KARAF_VERSION/bin/karaf "$@"