Fix error logged for send failure

[exim.git] / src / scripts / reversion

diff --git a/src/scripts/reversion b/src/scripts/reversion
index 32a867f25ce49dfca2415c0c35db1ba6203da6f3..9707b9c1c680911372d4b209d6132c28a5882f14 100755 (executable)
--- a/src/scripts/reversion
+++ b/src/scripts/reversion
@@ -1,7 +1,31 @@
 #!/bin/sh
+# Copyright (c) The Exim Maintainers 2016
+
+set -e
+LC_ALL=C
+export LC_ALL
 
 # Update Exim's version header file.
 
+# Compatibility gross-ness for non-POSIX systems
+if [ -z "$EXIM_REVERSION_ADJUSTED" ]
+then
+  SHELL=/bin/sh
+  EXIM_REVERSION_ADJUSTED=yes
+  export SHELL EXIM_REVERSION_ADJUSTED
+  # Solaris:
+  if [ -x /usr/xpg4/bin/sh ]
+  then
+    PATH="/usr/xpg4/bin:$PATH"
+    SHELL=/usr/xpg4/bin/sh
+    export PATH SHELL
+  fi
+  # Irix:
+  _XPG=1 ; export _XPG
+  #
+  exec "$SHELL" "$0" "$@"
+fi
+
 # Read version information that was generated by a previous run of
 # this script, or during the release process.
 
@@ -13,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
@@ -33,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