Cosmetics.

[scripts.git] / bashrc

diff --git a/bashrc b/bashrc
index a2f7987..f264e2c 100644 (file)
--- 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)