X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fmaven-fetch-metadata.sh;h=4f719e318c35066eb9a6fe53c01b4261a3d624f2;hb=04547fcca5cabd3d9ad24fced4a0cf268d789296;hp=270056f472fa84d561f8f315c5f0448a7980ffd6;hpb=bc5892ef503dc4039aa0aae4043e5c9b2cc9a363;p=releng%2Fglobal-jjb.git diff --git a/shell/maven-fetch-metadata.sh b/shell/maven-fetch-metadata.sh index 270056f4..4f719e31 100644 --- a/shell/maven-fetch-metadata.sh +++ b/shell/maven-fetch-metadata.sh @@ -13,9 +13,9 @@ echo "---> maven-fetch-metadata.sh" # Check for "-f" maven param, indicating a change in pom location. pom_path="pom.xml" -file_path=$(echo $MAVEN_PARAMS | grep -E "\-f \S+" | awk '{ print $2 }') -if [ ! -z $file_path ]; then - if [ -d $file_path ]; then +file_path=$(echo "$MAVEN_PARAMS" | grep -Eo "\-f \S+" | awk '{ print $2 }') +if [ -n "$file_path" ]; then + if [ -d "$file_path" ]; then pom_path="$file_path/pom.xml" else pom_path="$file_path" @@ -28,10 +28,10 @@ set -xeu -o pipefail project=$(xmlstarlet sel \ -N "x=http://maven.apache.org/POM/4.0.0" -t \ --if "/x:project/x:groupId" \ - -v "/x:project/x:groupId" \ + -v "/x:project/x:groupId" \ --elif "/x:project/x:parent/x:groupId" \ - -v "/x:project/x:parent/x:groupId" \ - --else -o "" $pom_path) + -v "/x:project/x:parent/x:groupId" \ + --else -o "" "$pom_path") project_path="${project//.//}" mkdir -p "$WORKSPACE/m2repo/$project_path"