X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/28c6059071a8c9db89aa34c70e9a4b0dc4000f26..0d9fa8c0a3e0e3dd140880861a60c3def18f176b:/src/scripts/reversion

diff --git a/src/scripts/reversion b/src/scripts/reversion
index ad83fe564..9707b9c1c 100755
--- a/src/scripts/reversion
+++ b/src/scripts/reversion
@@ -1,4 +1,9 @@
 #!/bin/sh
+# Copyright (c) The Exim Maintainers 2016
+
+set -e
+LC_ALL=C
+export LC_ALL
 
 # Update Exim's version header file.
 
@@ -32,13 +37,18 @@ fi
 
 # If this tree is a git working directory, use that to get version information.
 
-if [ -e ../../.git ] || [ "$1" = "release" ]
+if [ -d ../../.git ] || [ "$1" = "release" ]
 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
@@ -52,7 +62,7 @@ fi
 # create your own version.sh as part of your release process, or you
 # can modify EXIM_VARIANT_VERSION at this point in this script.
 
-case $EXIM_RELEASE_VERSION in
+case "$EXIM_RELEASE_VERSION" in
 '')	echo "*** Your copy of Exim lacks any version information."
 	exit 1
 esac