X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fwhitesource-unified-agent-cli.sh;h=94dd367010bff78a40977ec3f3d271f8a30349f2;hb=e1a8dc64cfe10360ebdcadd28806adf800760ce7;hp=6918f9cbfb37c3c1496f2bc78e8590e98998a157;hpb=76ee13a174ec2e94048d17f3dd1c5d0355518bf5;p=releng%2Fglobal-jjb.git diff --git a/shell/whitesource-unified-agent-cli.sh b/shell/whitesource-unified-agent-cli.sh index 6918f9cb..94dd3670 100644 --- a/shell/whitesource-unified-agent-cli.sh +++ b/shell/whitesource-unified-agent-cli.sh @@ -8,7 +8,7 @@ # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-v10.html ############################################################################## - +echo "---> whitesource-unified-agent-cli.sh" # This script downloads wss-unified-agent-.jar and uses it to perform # a scan on the code whithin a repo based on the wss-unified-agent.config provided. @@ -17,11 +17,11 @@ set -xe -o pipefail set -u echo "---> whitesource-unified-agent-cli.sh" -jar_location="/tmp/wss-unified-agent-$WSS_UNIFIED_AGENT_VERSION.jar" -wget -nv https://s3.amazonaws.com/unified-agent/wss-unified-agent-$WSS_UNIFIED_AGENT_VERSION.jar \ - -O $jar_location +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 \ - -product $WSS_PRODUCT_NAME -project $WSS_PROJECT_NAME \ - ${WSS_UNIFIED_AGENT_OPTIONS:-} -rm $jar_location +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}"