From: Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>
Date: Mon, 3 Dec 2018 15:44:35 +0000 (+0100)
Subject: reversion: Adapt to dotted release scheme
X-Git-Tag: exim-4.92-RC1~2
X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=commitdiff_plain;h=9d727701a16bf4a93b136fe01e1bf2e5996c96ee;hp=d50a8be23a0e941161b1abeee78ebb5d2304d15b

reversion: Adapt to dotted release scheme
---

diff --git a/src/scripts/reversion b/src/scripts/reversion
index 63b4adbfe..2d63ad746 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