X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=scripts.git;a=blobdiff_plain;f=bashrc;h=f264e2c97af710b11f7fc8c2624a9879550a37d2;hp=a2f79873cb7549180c863b23763d924784928abd;hb=4ec5d5f4a0a407340f44e06e5b187053782a0470;hpb=0ac08580d5068bc343f757be0a6f8b2d8e370233

diff --git a/bashrc b/bashrc
index a2f7987..f264e2c 100644
--- a/bashrc
+++ b/bashrc
@@ -189,20 +189,20 @@ function cdt () {
 alias t='cd /tmp'
 
 function trash () {
-    TRASH=$(find /tmp/ -maxdepth 1 -mmin -15 -type d -name "trash-*" | sort | tail -1)
+    TRASH=$(date +/tmp/trash-%Y-%b-%d-%Hh)
 
-    if [[ ${TRASH} ]]; then
+    if [[ -d ${TRASH} ]]; then
         echo "Re-use ${TRASH}"
     else
-        TRASH=$(date +/tmp/trash-%Y-%b-%d-%H_%M_%S)
         mkdir ${TRASH}
-        echo "Created ${TRASH}:"
+        echo "Created ${TRASH}"
     fi
 
     mv "$@" ${TRASH}
+    echo "Trashed $@"
 }
 
-alias trash=trash.sh
+# alias trash=trash.sh
 
 function mmsget () {
     mplayer $1 -dumpstream -dumpfile $(basename $1)