README.md

@@ -1,18 +1,18 @@
-# trash.sh - A trash bin for files and directories instead of deleting them directly
+# trash - A trash bin for files and directories instead of deleting them directly
 
-[![Build Status](https://drone.pyas.de/api/badges/Kim/trash.sh/status.svg)](https://drone.pyas.de/Kim/trash.sh)
+[![Build Status](https://drone.pyas.de/api/badges/Kim/trash/status.svg)](https://drone.pyas.de/Kim/trash)
 
 ## Installation:  
-Put the trash.sh file to your desired location (e.g home directory) and source it in your $HOME/.bashrc or in /etc/.bashrc:
+the trash.sh file in your desired path and source it in your $HOME/.bashrc or in /etc/.bashrc:
 
     . /path/to/trash.sh
 
-- When the script runs, it first checks if `$HOME/.trash/` (your trash bin) exists and creates it if missing.
+- As the Script runs it first checks if $HOME/.trash/ (your trash bin) in your home dir exists and creates it if missing.
 
-Add the cleanup job to your crontab:
+Add cleanup job to your cron:
 
     # .trash cleanup of all contents (files and dirs) older than 31 days every morning at 06:00
-    0 6 * * 0 find $HOME/.trash/ -mtime +31 -delete  
+    0 6 * * 0 find /home/YOURHOME/.trash/ -mtime +31 -delete  
 
 ## Usage: 
 

trash.sh

@@ -1,21 +1,18 @@
-#!/usr/bin/env bash
-# Trash Bin Functionss
-# On Github: https://github.com/kimdre/trash.sh
+#!/bin/bash
+# Trash Functions
 
-TRASH_DIR="$HOME/.trash"
-FILE_PATHS_FILE="$TRASH_DIR/.filepaths"
+TRASH_DIR="$HOME"/.trash
 
 [ ! -d "$TRASH_DIR" ] && mkdir "$TRASH_DIR"
+FILE_PATHS_FILE="$TRASH_DIR/.filepaths"
 [ ! -f "$FILE_PATHS_FILE" ] && touch "$FILE_PATHS_FILE"
 
 usage() {
   local func_args="$1"
 
   if [[ $func_args == 0 ]];
-    then echo -e "At least one file/directory as argument required:\nExamples: FILE.txt /DIR/FILE.txt SUB_DIR/FILE.* /DIR/* DIR/DIR ..."
-    return 1
-  else
-    return 0
+    then echo -e "At least one argument required:\ncommand FILE1  DIR2 ..."
+    exit
   fi
 }
 
@@ -24,13 +21,13 @@ trash_list() {
 }
 
 trash_put() {
-  usage "$#" && {
-    for FILE in $@; do
-      # Store old filepath for later restore
-      echo "$FILE $(readlink -f "$FILE")" >>"$FILE_PATHS_FILE"
-    done
-    mv -v $* "$TRASH_DIR/"
-  }
+  usage "$#"
+
+  for FILE in $@; do
+    # Store old filepath for later restore
+    echo "$FILE $(readlink -f "$FILE")" >>"$FILE_PATHS_FILE"
+  done
+  mv -v $* "$TRASH_DIR/"
 }
 
 trash_empty() {
@@ -39,34 +36,34 @@ trash_empty() {
 }
 
 trash_restore() {
-  usage "$#" && {
-    for FILE_TO_RESTORE in "$@"; do
-      # Get old filepath for restore
-      OLD_PATH=$(grep "$FILE_TO_RESTORE" "$FILE_PATHS_FILE" | cut -d ' ' -f2)
+  usage "$#"
 
-      # Move file to old filepath
-      mv -v "${TRASH_DIR}/${FILE_TO_RESTORE}" "$OLD_PATH"
+  for FILE_TO_RESTORE in "$@"; do
+    # Get old filepath for restore
+    OLD_PATH=$(grep "$FILE_TO_RESTORE" "$FILE_PATHS_FILE" | cut -d ' ' -f2)
 
-      # Replace / with \/ from string and remove filepath from file after move was successful
-      sed -i "/${FILE_TO_RESTORE////\\/}/d" "$FILE_PATHS_FILE"
-    done
-  }
+    # Move file to old filepath
+    mv -v "${TRASH_DIR}/${FILE_TO_RESTORE}" "$OLD_PATH"
+
+    # Replace / with \/ from string and remove filepath from file after move was successful
+    sed -i "/${FILE_TO_RESTORE////\\/}/d" "$FILE_PATHS_FILE"
+  done
 }
 
 trash_rm() {
-  usage "$#" && {
-    for FILE_TO_REMOVE in "$@"; do
-      if ! echo "$FILE_TO_REMOVE" | grep "$HOME/.trash"
-        then FILEPATH_TO_REMOVE="$HOME/.trash/$FILE_TO_REMOVE"
-         else FILEPATH_TO_REMOVE="$FILE_TO_REMOVE"
-      fi
-      if [ -f "$FILEPATH_TO_REMOVE" ]; then
-        \rm -irf "$FILEPATH_TO_REMOVE" && sed -i "/$FILE_TO_REMOVE/d" "$FILE_PATHS_FILE"
-      else
-        echo "$FILE_TO_REMOVE is not in Trash." && false
-      fi
-   done
-  }
+  usage "$#"
+
+  for FILE_TO_REMOVE in "$@"; do
+    if ! echo "$FILE_TO_REMOVE" | grep "$HOME/.trash"
+      then FILEPATH_TO_REMOVE="$HOME/.trash/$FILE_TO_REMOVE"
+      else FILEPATH_TO_REMOVE="$FILE_TO_REMOVE"
+    fi
+    if [ -f "$FILEPATH_TO_REMOVE" ]; then
+      \rm -irf "$FILEPATH_TO_REMOVE" && sed -i "/$FILE_TO_REMOVE/d" "$FILE_PATHS_FILE"
+    else
+      echo "$FILE_TO_REMOVE is not in Trash." && false
+    fi
+  done
 }
 
 alias trash='trash_put'