Merge "Updated vGW env, yaml and install scripts"

[demo.git] / boot / cli_install.sh

diff --git a/boot/cli_install.sh b/boot/cli_install.sh
index 57f0edc..c5ec421 100644 (file)
--- a/boot/cli_install.sh
+++ b/boot/cli_install.sh
@@ -21,6 +21,7 @@ CLI_INSTALL_DIR=/opt/onap/cli
 CLI_ZIP=cli.zip
 CLI_BIN=/usr/bin/onap
 export ONAP_CLI_HOME=$CLI_INSTALL_DIR
+export CLI_PRODUCT_VERSION=onap-1.1
 
 #create install dir
 if [ -d $CLI_INSTALL_DIR ]
@@ -33,7 +34,15 @@ mkdir -p $CLI_INSTALL_DIR
 cd $CLI_INSTALL_DIR
 
 #Download and unzip CLI
-apt-get install -y wget unzip openjdk-8-jre
+apt-get install -y wget unzip
+
+#check for java
+java -version
+if [ $? == 127 ]
+then
+    apt-get install -y openjdk-8-jre
+fi
+
 wget -O $CLI_ZIP $CLI_LATEST_BINARY
 
 unzip $CLI_ZIP