Merge branch 'exim-4.96+security'

[exim.git] / src / src / exiwhat.src

diff --git a/src/src/exiwhat.src b/src/src/exiwhat.src
index 4fdc09f785563009b16f7f4f311fa2df866879d6..812f0b149e7dc0beda1ce04b780c15ff9b4dd8a6 100644 (file)
--- a/src/src/exiwhat.src
+++ b/src/src/exiwhat.src
@@ -15,6 +15,7 @@
 # EXIWHAT_EGREP_ARG
 # EXIWHAT_MULTIKILL_CMD
 # EXIWHAT_MULTIKILL_ARG
+# RM_COMMAND
 
 # PROCESSED_FLAG
 
@@ -29,6 +30,8 @@
 # the script in the next Exim rebuild/install. However, it's best to
 # arrange your build-time configuration file to get the correct values.
 
+rm=RM_COMMAND
+
 # Some operating systems have a command that finds processes that match
 # certain conditions (by default usually those running specific commands)
 # and sends them signals. If such a command is defined for your OS, the
@@ -52,7 +55,7 @@ signal=EXIWHAT_KILL_SIGNAL
 # See if this installation is using the esoteric "USE_NODE" feature of Exim,
 # in which it uses the host's name as a suffix for the configuration file name.
 
-if test "x$1" = x--version
+if [ "x$1" = x--version -o "x$1" = x-v ]
 then
     echo "`basename $0`: $0"
     echo "build: EXIM_RELEASE_VERSIONEXIM_VARIANT_VERSION"
@@ -110,7 +113,7 @@ fi
 
 # Now do the job.
 
-/bin/rm -f ${log}
+$rm -f ${log}
 if [ -f ${log} ]; then
   echo "** Failed to remove ${log}"
   exit 1