From 8d2edf9a5f6a89f0b7b19f82d51b726c3732e050 Mon Sep 17 00:00:00 2001
From: Michal Cmarada <mcmarada@cisco.com>
Date: Wed, 27 Feb 2019 08:29:15 +0100
Subject: [PATCH] update jvpp mvn push script

 - skip pushing jars for ubuntu/1604
 - cleanup (simple variable usage warnings)

Change-Id: Iaf1409f9696b889135f85afdab2fe27cb16ce79a
Signed-off-by: Michal Cmarada <mcmarada@cisco.com>
---
 jjb/jvpp/include-raw-jvpp-maven-push.sh | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/jjb/jvpp/include-raw-jvpp-maven-push.sh b/jjb/jvpp/include-raw-jvpp-maven-push.sh
index 6554a58c2..9b0c517ad 100755
--- a/jjb/jvpp/include-raw-jvpp-maven-push.sh
+++ b/jjb/jvpp/include-raw-jvpp-maven-push.sh
@@ -5,43 +5,38 @@ echo "* STARTING PUSH OF JVPP PACKAGES TO REPOS"
 echo "* NOTHING THAT HAPPENS BELOW THIS POINT IS RELATED TO BUILD FAILURE"
 echo "*******************************************************************"
 
-[ "$MVN" ] || MVN="/opt/apache/maven/bin/mvn"
+[[ "$MVN" ]] || MVN="/opt/apache/maven/bin/mvn"
 GROUP_ID="io.fd.${PROJECT}"
 BASEURL="${NEXUSPROXY}/content/repositories/fd.io."
 BASEREPOID='fdio-'
 
-if [ "${OS}" == "ubuntu1604" ]; then
+if [[ "${OS}" == "ubuntu1604" ]]; then
     # Find the files
-    JARS=$(find ./java -type f -iname '*.jar')
     DEBS=$(find ./build-root/packages/ -type f -iname '*.deb')
-    for i in $JARS
-    do
-        push_jar "$i"
-    done
 
-    for i in $DEBS
+    for i in ${DEBS}
     do
         push_deb "$i"
     done
-elif [ "${OS}" == "ubuntu1804" ]; then
+elif [[ "${OS}" == "ubuntu1804" ]]; then
     # Find the files
     JARS=$(find ./java -type f -iname '*.jar')
     DEBS=$(find ./build-root/packages/ -type f -iname '*.deb')
-    for i in $JARS
+    for i in ${JARS}
     do
         push_jar "$i"
     done
 
-    for i in $DEBS
+    for i in ${DEBS}
     do
         push_deb "$i"
     done
-elif [ "${OS}" == "centos7" ]; then
+elif [[ "${OS}" == "centos7" ]]; then
     # Find the files
     RPMS=$(find ./build-root/packages/ -type f -iname '*.rpm')
     SRPMS=$(find ./build-root/packages/ -type f -iname '*.srpm')
     SRCRPMS=$(find ./build-root/packages/ -type f -name '*.src.rpm')
-    for i in $RPMS $SRPMS $SRCRPMS
+    for i in ${RPMS} ${SRPMS} ${SRCRPMS}
     do
         push_rpm "$i"
     done
-- 
2.16.6