[tomcat-connectors] 03/03: Git tags retained svn format (for now)

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git

commit 637edee00ca30b1d927f41d40748809c61ccb70e
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Feb 19 11:59:42 2020 +0000

    Git tags retained svn format (for now)
---
 tools/jkrelease.sh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/tools/jkrelease.sh b/tools/jkrelease.sh
index eca8196..fabd5a1 100755
--- a/tools/jkrelease.sh
+++ b/tools/jkrelease.sh
@@ -254,14 +254,17 @@ then
         JK_DIST=${JK_CVST}-${version}-dev${JK_SUFFIX}-src
     fi
 else
+    JK_TAG=`echo $version | sed -e 's#^#JK_#' -e 's#\.#_#g'`
     if [ $USE_GIT -eq 1 ]
     then
+        echo Tag:    [$tag]
+        echo JK_TAG: [$JK_TAG]
         if [ -n "$tag" ]
         then
             if [ -z "$force" ]
             then
-                echo $tag | grep "^$version" > /dev/null 2>&1
-                if [ "X$tag" != "X$version" ]
+                echo $tag | grep "^$JK_TAG" > /dev/null 2>&1
+                if [ "X$tag" != "X$JK_TAG" ]
                 then
                     echo "Tag '$tag' doesn't belong to version '$version'."
                     echo "Force by using '-f' if you are sure."
@@ -276,17 +279,16 @@ else
             fi
             JK_SUFFIX=-tag-${tag}-${JK_REV}
         else
-            JK_REV=`git ls-remote $REPOS refs/tags/$version | awk '{print $1}'`
+            JK_REV=`git ls-remote $REPOS refs/tags/$JK_TAG | awk '{print $1}'`
             if [ -z "$JK_REV" ]
             then
-               echo "No git hash found via 'git ls-remote $REPOS refs/tags/$version'"
+               echo "No git hash found via 'git ls-remote $REPOS refs/tags/$JK_TAG'"
                exit 3
             fi
             JK_SUFFIX=''
         fi
         JK_DIST=${JK_CVST}-${version}${JK_SUFFIX}-src
     else
-        JK_TAG=`echo $version | sed -e 's#^#JK_#' -e 's#\.#_#g'`
         if [ -n "$tag" ]
         then
             if [ -z "$force" ]


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org