Improve the way to deploy onap via proxy

[demo.git] / boot / cli_install.sh

diff --git a/boot/cli_install.sh b/boot/cli_install.sh
index 57f0edc..4593c68 100644 (file)
--- a/boot/cli_install.sh
+++ b/boot/cli_install.sh
@@ -16,11 +16,21 @@
 # limitations under the License.
 #*******************************************************************************
 
-CLI_LATEST_BINARY="https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.cli&a=cli-zip&e=zip&v=LATEST"
+CLI_LATEST_BINARY="https://nexus.onap.org/content/repositories/releases/org/onap/cli/cli-zip/1.1.0/cli-zip-1.1.0.zip"
 CLI_INSTALL_DIR=/opt/onap/cli
 CLI_ZIP=cli.zip
 CLI_BIN=/usr/bin/onap
+HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
+HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
+
+if [ $HTTP_PROXY != "no_proxy" ]
+then
+    export http_proxy=$HTTP_PROXY
+    export https_proxy=$HTTPS_PROXY
+fi
+
 export ONAP_CLI_HOME=$CLI_INSTALL_DIR
+export CLI_PRODUCT_VERSION=onap-1.1
 
 #create install dir
 if [ -d $CLI_INSTALL_DIR ]
@@ -33,7 +43,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