Change "expr" to "expr --" in all shell scripts. Fixes: #889

[exim.git] / src / src / exicyclog.src

diff --git a/src/src/exicyclog.src b/src/src/exicyclog.src
index 56e3b664440ea2874a5b16598b21715c2641240d..097de7eaa0fc1e0a466259607019441ee41129a9 100644 (file)
--- a/src/src/exicyclog.src
+++ b/src/src/exicyclog.src
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $Cambridge: exim/src/src/exicyclog.src,v 1.7 2008/02/06 12:35:03 nm4 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.
@@ -53,12 +53,12 @@ keep=EXICYCLOG_MAX
 compress=COMPRESS_COMMAND
 suffix=COMPRESS_SUFFIX
 
-chown=CHOWN_COMMAND
 chgrp=CHGRP_COMMAND
 chmod=CHMOD_COMMAND
-touch=TOUCH_COMMAND
+chown=CHOWN_COMMAND
 mv=MV_COMMAND
 rm=RM_COMMAND
+touch=TOUCH_COMMAND
 
 # End of editable lines
 #########################################################################
@@ -84,7 +84,7 @@ done
 # in different places. We have a fudge that will search the usual suspects if
 # requested.
 
-for cmd in chown chgrp mv rm ; do
+for cmd in chgrp chmod chown mv rm touch; do
   eval "oldcmd=\$$cmd"
   if [ "$oldcmd" != "look_for_it" ] ; then continue ; fi
   newcmd=$cmd
@@ -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