X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fwhitesource-unified-agent-cli.sh;h=a73e852165297d95e3abef6b0e77e7fc80179fca;hb=b55451a53da28d40c62de5cae462302a32fe4c31;hp=c092ad97fd9377e3b5619d32e7fef6daead0e545;hpb=bc5892ef503dc4039aa0aae4043e5c9b2cc9a363;p=releng%2Fglobal-jjb.git diff --git a/shell/whitesource-unified-agent-cli.sh b/shell/whitesource-unified-agent-cli.sh index c092ad97..a73e8521 100644 --- a/shell/whitesource-unified-agent-cli.sh +++ b/shell/whitesource-unified-agent-cli.sh @@ -19,9 +19,14 @@ set -u echo "---> whitesource-unified-agent-cli.sh" jar_location="/tmp/wss-unified-agent-${WSS_UNIFIED_AGENT_VERSION}.jar" wss_unified_agent_url="https://s3.amazonaws.com/unified-agent/wss-unified-agent-${WSS_UNIFIED_AGENT_VERSION}.jar" -wget -nv ${wss_unified_agent_url} -O ${jar_location} +wget -nv "${wss_unified_agent_url}" -O "${jar_location}" + echo "---> Running WhiteSource Unified Agent CLI ..." -java -jar ${jar_location} -c wss-unified-agent.config \ - -product ${WSS_PRODUCT_NAME} -project ${WSS_PROJECT_NAME} \ - -projectVersion ${GERRIT_BRANCH} ${WSS_UNIFIED_AGENT_OPTIONS:-} -rm ${jar_location} + +# WSS_UNIFIED_AGENT_OPTIONS & JAVA_OPTS are expected to be unquoted +# shellcheck disable=SC2086 +java ${JAVA_OPTS:-} -jar "${jar_location}" -c wss-unified-agent.config \ + -product "${WSS_PRODUCT_NAME}" -project "${WSS_PROJECT_NAME}" \ + -projectVersion "${GERRIT_BRANCH}" ${WSS_UNIFIED_AGENT_OPTIONS:-} + +rm "${jar_location}"