X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/14487e4cc632bd649a2b7285485e4bb8b6825769..32131d8971eef03a74eef7a7127ca32d4378f50e:/src/scripts/exim_install diff --git a/src/scripts/exim_install b/src/scripts/exim_install index 2f70c6e35..1e8805024 100755 --- a/src/scripts/exim_install +++ b/src/scripts/exim_install @@ -1,5 +1,4 @@ #! /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 @@ -218,13 +217,15 @@ while [ $# -gt 0 ]; do # 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 "" - 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 ***" + $exim exit 1 fi @@ -378,7 +379,7 @@ done 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.