DANE: Fix 2-rcpt message, diff domins case. Bug 2265

[exim.git] / src / scripts / exim_install

diff --git a/src/scripts/exim_install b/src/scripts/exim_install
index 2f70c6e35fa99b740c5eca9575f5937d2e6acb34..1e8805024f055811ac104c48e5dc00454bb90416 100755 (executable)
--- a/src/scripts/exim_install
+++ b/src/scripts/exim_install
@@ -1,5 +1,4 @@
 #! /bin/sh
 #! /bin/sh

-# $Cambridge: exim/src/scripts/exim_install,v 1.2 2005/09/06 13:18:13 ph10 Exp $

 
 # Script to install Exim binaries in BIN_DIRECTORY, which is defined in
 # the local Makefile. It expects to be run in a build directory. It needs
 
 # Script to install Exim binaries in BIN_DIRECTORY, which is defined in
 # the local Makefile. It expects to be run in a build directory. It needs


@@ -218,13 +217,15 @@ while [ $# -gt 0 ]; do
   # The exim binary is handled specially
 
   if [ $name = exim${EXE} ]; then
   # The exim binary is handled specially
 
   if [ $name = exim${EXE} ]; then

-    version=exim-`./exim -bV -C /dev/null | \
+    exim="./exim -bV -C /dev/null"
+    version=exim-`$exim 2>/dev/null | \

       awk '/Exim version/ { OFS=""; print $3,"-",substr($4,2,length($4)-1) }'`${EXE}
 
     if [ "${version}" = "exim-${EXE}" ]; then
       echo $com ""
       awk '/Exim version/ { OFS=""; print $3,"-",substr($4,2,length($4)-1) }'`${EXE}
 
     if [ "${version}" = "exim-${EXE}" ]; then
       echo $com ""

-      echo $com "*** Could not run ./exim to find version number ***"
+      echo $com "*** Could not run $exim to find version number ***"

       echo $com "*** Exim installation ${ver}failed ***"
       echo $com "*** Exim installation ${ver}failed ***"

+      $exim

       exit 1
     fi
 
       exit 1
     fi
 


@@ -378,7 +379,7 @@ done
 
 echo $com ""
 
 
 echo $com ""
 

-if [ `expr "${CONFIGURE_FILE}" : ".*:"` -ne 0 ] ; then
+if [ `expr -- "${CONFIGURE_FILE}" : ".*:"` -ne 0 ] ; then

   echo $com Runtime configuration is specified as the following list:
   echo $com ' ' ${CONFIGURE_FILE}
   echo $com Therefore, skipping automatic installation.
   echo $com Runtime configuration is specified as the following list:
   echo $com ' ' ${CONFIGURE_FILE}
   echo $com Therefore, skipping automatic installation.