From 9677df8a76b314477c37b0fed7401dcfb1c268eb Mon Sep 17 00:00:00 2001
From: "Heiko Schlittermann (HS12-RIPE)" <hs@schlittermann.de>
Date: Wed, 24 Feb 2016 23:59:26 +0100
Subject: Release: fix release script

- accept minor version number
- allow to skip the build-of-documentation step
- allow release of "any" version from anywhere
- avoid calling "old" reversion scripts, create version.sh
---
 src/scripts/reversion | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/scripts/reversion b/src/scripts/reversion
index c4618868e..66c6efbe0 100755
--- a/src/scripts/reversion
+++ b/src/scripts/reversion
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+set -e
+export LC_ALL=C
+
 # Update Exim's version header file.
 
 # Compatibility gross-ness for non-POSIX systems
@@ -37,8 +40,13 @@ then
 	# Modify the output of git describe into separate parts for
 	# the name "exim" and the release and variant versions.
 	# Put a dot in the version number and remove a spurious g.
-	set $(git describe --dirty=-XX --match 'exim-4*' |
-		sed 's|-| |;s|_|.|;s|[-_]| _|;s|-g|-|')
+	if [ "$2" ]
+	then
+	    description=$(git describe "$2")
+	else
+	    description=$(git describe --dirty=-XX --match 'exim-4*')
+	fi
+	set $(echo "$description" | sed 's|-| |;s|_|.|;s|[-_]| _|;s|-g|-|')
 	# Only update if we need to
 	if [ "$2 $3" != "$EXIM_RELEASE_VERSION $EXIM_VARIANT_VERSION" ]
 	then
-- 
cgit v1.2.3