From 68af2ce98554fe2583eb1389cf3b0475cc310f7b Mon Sep 17 00:00:00 2001 From: Martin Medek Date: Thu, 5 May 2022 11:43:35 +0200 Subject: [PATCH] DBZ-5082 wrapped components param to quites, loading as single string in script and added newline to eof --- jenkins-jobs/job-dsl/maven_artifact_check.groovy | 4 ++-- jenkins-jobs/scripts/maven-artifact-check.sh | 13 +------------ 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/jenkins-jobs/job-dsl/maven_artifact_check.groovy b/jenkins-jobs/job-dsl/maven_artifact_check.groovy index e53946705..d77a92176 100644 --- a/jenkins-jobs/job-dsl/maven_artifact_check.groovy +++ b/jenkins-jobs/job-dsl/maven_artifact_check.groovy @@ -16,7 +16,7 @@ freeStyleJob('prepare-maven-artifact-check') { steps { shell(''' - jenkins-jobs/scripts/maven-artifact-check.sh -u $ARTIFACT_URL --components $COMPONENTS + jenkins-jobs/scripts/maven-artifact-check.sh -u $ARTIFACT_URL --components "$COMPONENTS" ''') } -} \ No newline at end of file +} diff --git a/jenkins-jobs/scripts/maven-artifact-check.sh b/jenkins-jobs/scripts/maven-artifact-check.sh index f9aeddd10..e7c35d29e 100755 --- a/jenkins-jobs/scripts/maven-artifact-check.sh +++ b/jenkins-jobs/scripts/maven-artifact-check.sh @@ -17,18 +17,7 @@ while true; do case "$1" in -f | --file ) ARTIFACT_FILE=$2; shift; shift ;; -u | --url ) ARTIFACT_URL=$2; shift; shift ;; - --components ) shift; - EXPECTED_COMPONENTS=(); - param=$1; - while [ "${param:0:1}" != "-" ] && [ -n "$param" ]; do - EXPECTED_COMPONENTS+=("$1"); - shift; - param=$1; - if [ "$param" == "--" ]; then - shift; - param=$1; - fi - done ;; + --components ) EXPECTED_COMPONENTS=$2 shift; shift ;; -h | --help ) PRINT_HELP=true; shift ;; -- ) shift; break ;; * ) break ;;