diff options
| -rwxr-xr-x | jjb/jvpp/include-raw-jvpp-maven-push.sh | 21 |
1 files 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 |