Bruce/bin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bug with trashing directories

Browse Source
This commit is contained in:
Robert Rothenberg 2011-06-22 07:11:51 +01:00
parent 63dedc66fd
commit 46163315ca
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
trash
View File

@ -15,7 +15,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
version="0.3.9 \$Id: trash 2011/06/18 13:24:35 BST rr@newfie $" version="0.3.10 \$Id: trash 2011/06/22 07:10:41 BST rr@newfie $"
progname=`basename $0` progname=`basename $0`
@ -233,7 +233,10 @@ function trash_file {
ext="" ext=""
fi fi
deletedfile=$(mktemp --tmpdir="${trashdir}/files" --suffix="${ext}" "${trashname}_XXXXXXXX" ) # 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.
deletedfile=$(mktemp --dry-run --tmpdir="${trashdir}/files" --suffix="${ext}" "${trashname}_XXXXXXXX" )
deletedbase=$( basename "${deletedfile}" ) deletedbase=$( basename "${deletedfile}" )
deletedinfo="$trashdir/info/${deletedbase}.trashinfo" deletedinfo="$trashdir/info/${deletedbase}.trashinfo"
@ -245,7 +248,7 @@ Path=$canon
DeletionDate=`date +"%FT%H:%M:%S"` DeletionDate=`date +"%FT%H:%M:%S"`
END END
mv $mv_opts "$filename" "$deletedfile" mv $mv_opts --no-clobber "${filename}" "${deletedfile}"
} }
for f in "$@" for f in "$@"