diff options
| author | Nigel Metheringham <nigel@exim.org> | 2009-10-30 15:14:04 +0000 |
|---|---|---|
| committer | Nigel Metheringham <nigel@exim.org> | 2009-10-30 15:14:04 +0000 |
| commit | 17792b53d16f2061cb7350001e81c995bac6a9eb (patch) | |
| tree | 9cdbcc6141c85e37064125919c90b05063ccf6e7 /src | |
| parent | 1da77999df7a8f5a91859eb43e4e806e3c50236d (diff) | |
Change "expr" to "expr --" in all shell scripts. Fixes: #889
Diffstat (limited to 'src')
| -rwxr-xr-x | src/scripts/exim_install | 4 | ||||
| -rw-r--r-- | src/src/exicyclog.src | 6 | ||||
| -rw-r--r-- | src/src/exinext.src | 12 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/scripts/exim_install b/src/scripts/exim_install index 2f70c6e35..616ab3c16 100755 --- a/src/scripts/exim_install +++ b/src/scripts/exim_install @@ -1,5 +1,5 @@ #! /bin/sh -# $Cambridge: exim/src/scripts/exim_install,v 1.2 2005/09/06 13:18:13 ph10 Exp $ +# $Cambridge: exim/src/scripts/exim_install,v 1.3 2009/10/30 15:14:04 nm4 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 @@ -378,7 +378,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. diff --git a/src/src/exicyclog.src b/src/src/exicyclog.src index c1af5d179..097de7eaa 100644 --- a/src/src/exicyclog.src +++ b/src/src/exicyclog.src @@ -1,5 +1,5 @@ #! /bin/sh -# $Cambridge: exim/src/src/exicyclog.src,v 1.9 2009/01/20 16:06:14 fanf2 Exp $ +# $Cambridge: exim/src/src/exicyclog.src,v 1.10 2009/10/30 15:14:04 nm4 Exp $ # Copyright (c) 2006 University of Cambridge. # See the file NOTICE for conditions of use and distribution. @@ -251,7 +251,7 @@ count=$keep if [ $count -lt 10 ]; then countt=0$count; else countt=$count; fi while [ $count -gt 1 ]; do - old=`expr $count - 1` + old=`expr -- $count - 1` if [ $keep -gt 99 ]; then if [ $old -lt 10 ]; then oldt=00$old elif [ $old -lt 100 ]; then oldt=0$old @@ -334,7 +334,7 @@ while [ $count -le $keep ]; do $chown $user:$group $paniclog.$countt.$suffix fi - count=`expr $count + 1` + count=`expr -- $count + 1` done # End of exicyclog diff --git a/src/src/exinext.src b/src/src/exinext.src index 7fe80c796..80d636972 100644 --- a/src/src/exinext.src +++ b/src/src/exinext.src @@ -1,5 +1,5 @@ #! /bin/sh -# $Cambridge: exim/src/src/exinext.src,v 1.3 2007/07/29 21:49:46 magnus Exp $ +# $Cambridge: exim/src/src/exinext.src,v 1.4 2009/10/30 15:14:04 nm4 Exp $ # Copyright (c) 1996-2004 University of Cambridge. # See the file NOTICE for conditions of use and distribution. @@ -26,16 +26,16 @@ config= eximmacdef= exim_path= -if expr $1 : '\-' >/dev/null ; then - while expr $1 : '\-' >/dev/null ; do +if expr -- $1 : '\-' >/dev/null ; then + while expr -- $1 : '\-' >/dev/null ; do if [ "$1" = "-C" ]; then config=$2 shift shift - elif expr $1 : '\-D' >/dev/null ; then + elif expr -- $1 : '\-D' >/dev/null ; then eximmacdef="$eximmacdef $1" - if expr $1 : '\-DEXIM_PATH=' >/dev/null ; then - exim_path=`expr $1 : '\-DEXIM_PATH=\(.*\)'` + if expr -- $1 : '\-DEXIM_PATH=' >/dev/null ; then + exim_path=`expr -- $1 : '\-DEXIM_PATH=\(.*\)'` fi shift else |