From 59f8abca695a2e9438edc2f0d2ab824843448bd6 Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Mon, 30 Jul 2018 12:29:22 +1000 Subject: [PATCH] Handle snapshot artifacts in get_file_info() This fixes lftools deploy maven-file to upload snapshot artifacts to Nexus. Issue: RELENG-1098 Change-Id: I5ed1c030b2b9c8f62e7f7e4ee0a63858782a747c Signed-off-by: Anil Belur --- shell/deploy | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/shell/deploy b/shell/deploy index 41dfe120..f401bc6d 100755 --- a/shell/deploy +++ b/shell/deploy @@ -301,14 +301,20 @@ get_file_info () { artifact_id=$(echo "$basefile" | cut -f 1 -d '_') else # handle other file types (tar, jar, gunzip files versions) - artifact_id=$(echo "$basefile" | rev | cut -f 2- -d '-' | rev) + # extract artifactId from string - + # regex ex: input "onap-amsterdam1-regional-controller-master-1.0.0-SNAPSHOT" + # returns "onap-amsterdam1-regional-controller-master" + artifact_id=$(echo "$basefile" | sed -r 's#(.*)-([0-9.]+(-SNAPSHOT)?)$#\1#g') fi if [ -z "$version" ] && [[ "$1" =~ rpm|deb ]]; then version=$(echo "$basefile" | cut -f 2- -d '_') else # handle other file types (tar, jar, gunzip files versions) - version=$(echo "$basefile" | rev | cut -f 1 -d '-' | rev) + # extract version from string - + # regex ex: input "onap-amsterdam1-regional-controller-master-1.0.0-SNAPSHOT" returns "1.0.0-SNAPSHOT" or + # ex: input "onap-1.0.0" returns "1.0.0" + version=$(echo "$basefile" | sed -r 's#(.*)-([0-9.]+(-SNAPSHOT)?)$#\2#g') fi } -- 2.16.6