commit 48d0baf44943f5e4a58a18fe85607a980ff78a4d
author Kailash <kailash@onlab.us> Tue Jul 30 09:44:12 2019 -0700
committer Kailash <kailash@onlab.us> Tue Jul 30 10:37:32 2019 -0700
tree c22b2583da58d218425ebf9abc3b04bd29a7ff3f
parent 4ddf241549ba89362e35abe1ec83090b90099944

dhcp and aaa app names to use env vars

onos-files/install-onos-applications.sh

diff --git a/onos-files/install-onos-applications.sh b/onos-files/install-onos-applications.sh
index 9d60987..6489aba 100755
--- a/onos-files/install-onos-applications.sh
+++ b/onos-files/install-onos-applications.sh
@@ -22,6 +22,18 @@
 AAA_NAME=${AAA_NAME:aaa-app}
 DHCP_NAME=${DHCP_NAME:dhcpl2relay-app}
 
+if [ $(expr $AAA_VER \> 1.9.0) -eq 1 ]; then
+    AAA_NAME=aaa-app
+else
+    AAA_NAME=aaa
+fi
+
+if [ $(expr $DHCP_VER \> 1.6.0) -eq 1 ]; then
+    DHCP_NAME=dhcpl2relay-app
+else
+    DHCP_NAME=dhcpl2relay
+fi
+
 TYPE=${TYPE:-minimal}
 
 if [ "$TYPE" == "full" ]; then