From cd1e34565d9bf7ce30a60bac6d17baa2659b4c0a Mon Sep 17 00:00:00 2001
From: Robert Rothenberg <robrwo@gmail.com>
Date: Sat, 5 Nov 2011 16:38:10 +0000
Subject: [PATCH] Changes to work on systems with older versions of mv and
 mktemp such as CentOS 5.

Fix issue where file name included extension twice.
---
 trash | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/trash b/trash
index 1f6dac9..e0d80da 100755
--- a/trash
+++ b/trash
@@ -233,10 +233,11 @@ function trash_file {
     ext=""
   fi
 
-  # Use --dry-run option because we cannot mv a directory into a file.
-  # This is technically "unsafe" but we use --no-clobber option in mv.
+  # Use -u (unsafe) option because we cannot mv a directory into a
+  # file.  This is technically "unsafe" but mv will ask for
+  # confirmation when overwriting.
 
-  deletedfile=$(mktemp --dry-run --tmpdir="${trashdir}/files" --suffix="${ext}" "${trashname}_XXXXXXXX" )
+  deletedfile=$(mktemp -u "${trashdir}/files/${origname}_XXXXXXXX" )$ext
   deletedbase=$( basename "${deletedfile}" )
   deletedinfo="$trashdir/info/${deletedbase}.trashinfo"
 
@@ -252,7 +253,7 @@ END
   # permissions of the person who deleted the file, and not
   # necessarily of the original file.
 
-  mv $mv_opts --no-clobber "${filename}" "${deletedfile}"
+  mv $mv_opts "${filename}" "${deletedfile}"
   if [ "$?" != "0" ]; then
     echo "${progname}: unable to move ${filename} to ${deletedfile}" 1>&2
     rm "$deletedinfo"