4 files changed, 33 insertions, 18 deletions

diff --git a/Makefile b/Makefile
index 7d1b83a..0e62fa4 100644
--- a/Makefile
+++ b/Makefile
@@ -30,8 +30,7 @@ SCRIPTS =       addressgrep \
                 templess \
                 togglemute \
                 translate \
-                trashrm \
-                trashempty \
+                trash \
                 urlgrep \
                 volume \
                 websearch \
diff --git a/trash b/trash
new file mode 100755
index 0000000..0e6a524
--- /dev/null
+++ b/trash
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+# Simple trash management. Files are moved to a directory named with the
+# current date.
+
+# Usage: trash [rm FILE(s)|ls|empty]
+# Pretty self-explanatory
+
+trashfolder=${TRASH:-$XDG_DATA_HOME/mytrash}
+
+if [ -z "$1" ]; then
+        echo "usage: trash [rm FILE(s)|ls|empty]"
+else
+case "$1" in
+        empty)
+                rm -r $trashfolder/*
+                ;;
+        ls)
+                ls $trashfolder
+                ;;
+        rm)
+                thisfolder="$trashfolder/$(date +'%Y-%m-%d-%s')"
+                mkdir -p "$thisfolder"
+                shift 1
+                mv "$@" "$thisfolder"
+                ;;
+                
+        *)
+                echo "$1: not a valid command"
+                ;;
+esac
+fi
diff --git a/trashempty b/trashempty
deleted file mode 100755
index f13df45..0000000
--- a/trashempty
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-# Empty trash (see trashrm)
-
-trashfolder=${TRASH:-$XDG_DATA_HOME/mytrash}
-
-rm -r $trashfolder/*
diff --git a/trashrm b/trashrm
deleted file mode 100755
index 27cd724..0000000
--- a/trashrm
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# Move files to a trash folder
-
-trashfolder=${TRASH:-$XDG_DATA_HOME/mytrash}
-thisfolder="$trashfolder/$(date +'%Y-%m-%d-%s')"
-
-mkdir -p "$thisfolder"
-mv "$@" "$thisfolder"