Pass multiple pattern args in logs-deploy.sh

[releng/global-jjb.git] / shell / whitesource-unified-agent-cli.sh

diff --git a/shell/whitesource-unified-agent-cli.sh b/shell/whitesource-unified-agent-cli.sh
index 6918f9c..c092ad9 100644 (file)
--- 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-<version>.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 -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}