[exim-cvs] reversion: Adapt to dotted release scheme

Page principale
Supprimer ce message
Répondre à ce message
Auteur: Exim Git Commits Mailing List
Date:  
À: exim-cvs
Sujet: [exim-cvs] reversion: Adapt to dotted release scheme
Gitweb: https://git.exim.org/exim.git/commitdiff/9d727701a16bf4a93b136fe01e1bf2e5996c96ee
Commit:     9d727701a16bf4a93b136fe01e1bf2e5996c96ee
Parent:     d50a8be23a0e941161b1abeee78ebb5d2304d15b
Author:     Heiko Schlittermann (HS12-RIPE) <hs@???>
AuthorDate: Mon Dec 3 16:44:35 2018 +0100
Committer:  Heiko Schlittermann (HS12-RIPE) <hs@???>
CommitDate: Thu Dec 13 22:50:23 2018 +0100


    reversion: Adapt to dotted release scheme
---
 src/scripts/reversion | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


diff --git a/src/scripts/reversion b/src/scripts/reversion
index 63b4adb..2d63ad7 100755
--- a/src/scripts/reversion
+++ b/src/scripts/reversion
@@ -29,7 +29,6 @@ fi
# Read version information that was generated by a previous run of
# this script, or during the release process.

-    set $(echo "$description" | sed 's|-| |;s|_|.|;s|[-_]| _|;s|-g|-|')
 if   [ -f ./version.sh ]; then
     .    ./version.sh
 elif [ -f ../src/version.sh ]; then
@@ -44,6 +43,7 @@ elif [ -d ../../.git ] || [ -f ../../.git ] || [ "$1" = release ]; then
     else
         description=$(git describe --dirty=-XX --match 'exim-4*')
     fi
+    set $(echo "$description" | sed 's/-/ /; s/-g/-/')
     # Only update if we need to
     if [ "$2 $3" != "$EXIM_RELEASE_VERSION $EXIM_VARIANT_VERSION" ]
     then