X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fwhitesource-unified-agent-cli.sh;h=a73e852165297d95e3abef6b0e77e7fc80179fca;hb=refs%2Ftags%2Fv0.66.1;hp=ff6db6e022eac08d19a8d198915f20da3b3320e1;hpb=8709ee5e00526ce3298b92a85a79a7f058d4216b;p=releng%2Fglobal-jjb.git diff --git a/shell/whitesource-unified-agent-cli.sh b/shell/whitesource-unified-agent-cli.sh index ff6db6e0..a73e8521 100644 --- a/shell/whitesource-unified-agent-cli.sh +++ b/shell/whitesource-unified-agent-cli.sh @@ -20,8 +20,13 @@ 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}" + echo "---> Running WhiteSource Unified Agent CLI ..." -java -jar "${jar_location}" -c wss-unified-agent.config \ + +# 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:-}" + -projectVersion "${GERRIT_BRANCH}" ${WSS_UNIFIED_AGENT_OPTIONS:-} + rm "${jar_location}"