safe-rm 1.0.8 → 3.0.0

package/bin/rm.sh

@@ -1,34 +1,33 @@
 #!/bin/bash
 
-# You could modify these environment variables to change the default constants
-# Default to ~/.Trash on Mac, ~/.local/share/Trash/files on Linux.
-DEFAULT_TRASH="$HOME/.Trash"
-if [[ "$(uname -s)" == "Linux" ]]; then
-  DEFAULT_TRASH="$HOME/.local/share/Trash/files"
-fi
+# Basic configuration
+# ------------------------------------------------------------------------------
 
+DEFAULT_SAFE_RM_CONFIG="$HOME/.safe-rm/config"
 
-SAFE_RM_TRASH=${SAFE_RM_TRASH:="$DEFAULT_TRASH"}
+# You could modify the location of the configuration file by using
+# ```sh
+# $ export SAFE_RM_CONFIG=/path/to/safe-rm.conf
+# ```
+SAFE_RM_CONFIG=${SAFE_RM_CONFIG:="$DEFAULT_SAFE_RM_CONFIG"}
+
+if [[ -f "$SAFE_RM_CONFIG" ]]; then
+  source "$SAFE_RM_CONFIG"
+fi
 
+SAFE_RM_CONFIG_ROOT=${SAFE_RM_CONFIG_ROOT:="$HOME/.safe-rm"}
 
 # Print debug info or not
 SAFE_RM_DEBUG=${SAFE_RM_DEBUG:=}
-# -------------------------------------------------------------------------------
 
-# Simple basename: /bin/rm -> rm
-COMMAND=${0##*/}
-
-# pwd
-__DIRNAME=$(pwd)
+# Whether to delete files in the trash permanently, defaults to NO
+if [[ ${SAFE_RM_PERM_DEL_FILES_IN_TRASH:0:1} =~ [yY] ]]; then
+  SAFE_RM_PERM_DEL_FILES_IN_TRASH=1
+else
+  SAFE_RM_PERM_DEL_FILES_IN_TRASH=
+fi
 
-GUID=0
-TIME=
-date_time(){
-  TIME=$(date +%Y-%m-%d_%H:%M:%S)-$GUID
-  (( GUID += 1 ))
-}
 
-# tools
 debug(){
   if [[ -n "$SAFE_RM_DEBUG" ]]; then
     echo "[D] $@" >&2
@@ -36,7 +35,124 @@ debug(){
 }
 
 
-# parse argv -------------------------------------------------------------------------------
+error(){
+  echo $@ >&2
+}
+
+
+# global exit code, default to 0
+EXIT_CODE=0
+
+# Usage:
+# ```
+# do_exit $LINENO
+# do_exit $LINENO 1
+# ```
+do_exit(){
+  local line=$1
+  local code=$EXIT_CODE
+
+  if [[ $# -eq 2 ]]; then
+    code=$2
+  fi
+
+  # Exit immediately
+  debug "$line: exit code $code"
+  exit $code
+}
+
+
+if [[ "$(uname -s)" == "Darwin"* && -z $SAFE_RM_DEBUG_LINUX ]]; then
+  OS_TYPE="MacOS"
+  DEFAULT_TRASH="$HOME/.Trash"
+else
+  OS_TYPE="Linux"
+  DEFAULT_TRASH="$HOME/.local/share/Trash"
+  SAFE_RM_USE_APPLESCRIPT=
+fi
+
+
+# The target trash directory to dispose files and directories,
+#   defaults to the system trash directory
+SAFE_RM_TRASH=${SAFE_RM_TRASH:="$DEFAULT_TRASH"}
+
+
+if [[ "$OS_TYPE" == "MacOS" ]]; then
+  if command -v osascript &> /dev/null; then
+    # `SAFE_RM_USE_APPLESCRIPT=no` in your SAFE_RM_CONFIG file
+    #   to disable AppleScript
+    if [[ "$SAFE_RM_USE_APPLESCRIPT" == "no" ]]; then
+      debug "$LINENO: applescript disabled by conf"
+      SAFE_RM_USE_APPLESCRIPT=
+
+    elif [[ "$SAFE_RM_TRASH" == "$DEFAULT_TRASH" ]]; then
+      debug "$LINENO: applescript enabled"
+      SAFE_RM_USE_APPLESCRIPT=1
+    else
+      debug "$LINENO: applescript disabled due to custom trash"
+      SAFE_RM_USE_APPLESCRIPT=
+    fi
+  else
+    SAFE_RM_USE_APPLESCRIPT=
+  fi
+else
+  if mkdir -p "$SAFE_RM_TRASH/files" &> /dev/null; then
+    debug "$LINENO: linux trash enabled"
+  else
+    error "$COMMAND: failed to create trash directory $SAFE_RM_TRASH/files"
+    do_exit $LINENO 1
+  fi
+
+  if mkdir -p "$SAFE_RM_TRASH/info" &> /dev/null; then
+    :
+  else
+    error "$COMMAND: failed to create trash info directory $SAFE_RM_TRASH/info"
+    do_exit $LINENO 1
+  fi
+fi
+
+
+SAFE_RM_PROTECTED_RULES="${SAFE_RM_CONFIG_ROOT}/.gitignore"
+
+debug $SAFE_RM_PROTECTED_RULES
+
+# But if it is not a file
+if [[ -f "$SAFE_RM_PROTECTED_RULES" ]]; then
+  if command -v git &> /dev/null; then
+    debug "$LINENO: protected rules enabled: $SAFE_RM_PROTECTED_RULES"
+
+    if git -C "$SAFE_RM_CONFIG_ROOT" rev-parse --is-inside-work-tree &> /dev/null; then
+      :
+    else
+      error "[WARNING] safe-rm requires a git repository to use protected rules"
+      error "Initializing a git repository in \"$SAFE_RM_CONFIG_ROOT\" ..."
+
+      git -C "$SAFE_RM_CONFIG_ROOT" init -q
+
+      error "Success"
+    fi
+  else
+    error "[WARNING] safe-rm requires git installed to use protected rules"
+    error "  please install git"
+    error "  or remove the file \"$SAFE_RM_PROTECTED_RULES\""
+    SAFE_RM_PROTECTED_RULES=
+  fi
+else
+  SAFE_RM_PROTECTED_RULES=
+fi
+
+
+# ------------------------------------------------------------------------------
+
+# Simple basename: /bin/rm -> rm
+COMMAND=${0##*/}
+
+# pwd
+__DIRNAME=$(pwd)
+
+
+# parse argv
+# ------------------------------------------------------------------------------
 
 invalid_option(){
   # if there's an invalid option, `rm` only takes the second char of the option string
@@ -48,19 +164,20 @@ invalid_option(){
 }
 
 usage(){
-  echo "usage: rm [-f | -i | -I] [-dPRrvW] file ..."
-  echo "       unlink file"
+  echo "usage: rm [-f | -i] [-dIRrv] file ..."
+  echo "       unlink [--] file"
 
   # if has an invalid option, exit with 64
   exit 64
 }
 
 
-if [[ "$#" = 0 ]]; then
+if [[ "$#" == 0 ]]; then
   echo "safe-rm"
   usage
 fi
 
+
 ARG_END=
 FILE_NAME=
 ARG=
@@ -92,10 +209,15 @@ push_file(){
 
 # pre-parse argument vector
 while [[ -n $1 ]]; do
-  # case:
+  # Case 1:
   # rm -v abc -r --force
   # -> -r will be ignored
   # -> args: ['-v'], files: ['abc', '-r', 'force']
+
+  # Case 2:
+  # rm -- -r
+  # -> -r will be treated as a file
+  # -> args: [], files: ['-r']
   if [[ -n $ARG_END ]]; then
     push_file "$1"
 
@@ -112,24 +234,24 @@ while [[ -n $1 ]]; do
     # Regex in bash is not perl regex,
     # in which `'*'` means "anything" (including nothing)
     -[a-zA-Z]*)
-      split_push_arg $1; debug "short option $1"
+      split_push_arg $1; debug "$LINENO: short option $1"
       ;;
 
     # rm --force a
     --[a-zA-Z]*)
-      push_arg $1; debug "option $1"
+      push_arg $1; debug "$LINENO: option $1"
       ;;
 
     # rm -- -a
     --)
-      ARG_END=1; debug "divider"
+      ARG_END=1; debug "$LINENO: divider"
       ;;
 
     # case:
     # rm -
     # -> args: [], files: ['-']
     *)
-      push_file "$1"; debug "file $1"
+      push_file "$1"; debug "$LINENO: file $1"
       ARG_END=1
       ;;
     esac
@@ -144,9 +266,7 @@ OPT_INTERACTIVE=
 OPT_INTERACTIVE_ONCE=
 OPT_RECURSIVE=
 OPT_VERBOSE=
-
-# global exit code, default to 0
-EXIT_CODE=0
+OPT_EMPTY_DIR=
 
 # parse options
 for arg in ${ARG[@]}; do
@@ -159,29 +279,33 @@ for arg in ${ARG[@]}; do
   # ;;
 
   -f|--force)
-    OPT_FORCE=1;        debug "force        : $arg"
+    OPT_FORCE=1;        debug "$LINENO: force        : $arg"
     ;;
 
   # interactive=always
   -i|--interactive|--interactive=always)
-    OPT_INTERACTIVE=1;  debug "interactive  : $arg"
+    OPT_INTERACTIVE=1;  debug "$LINENO: interactive  : $arg"
     OPT_INTERACTIVE_ONCE=
     ;;
 
   # interactive=once. interactive=once and interactive=always are exclusive
   -I|--interactive=once)
-    OPT_INTERACTIVE_ONCE=1;  debug "interactive_once  : $arg"
+    OPT_INTERACTIVE_ONCE=1;  debug "$LINENO: interactive_once  : $arg"
     OPT_INTERACTIVE=;
     ;;
 
   # both r and R is allowed
   -[rR]|--[rR]ecursive)
-    OPT_RECURSIVE=1;    debug "recursive    : $arg"
+    OPT_RECURSIVE=1;    debug "$LINENO: recursive    : $arg"
     ;;
 
   # only lowercase v is allowed
   -v|--verbose)
-    OPT_VERBOSE=1;      debug "verbose      : $arg"
+    OPT_VERBOSE=1;      debug "$LINENO: verbose      : $arg"
+    ;;
+
+  -d|--directory)
+    OPT_EMPTY_DIR=1;    debug "$LINENO: empty dir    : $arg"
     ;;
 
   *)
@@ -189,7 +313,8 @@ for arg in ${ARG[@]}; do
     ;;
   esac
 done
-# /parse argv -------------------------------------------------------------------------------
+# /parse argv
+# ------------------------------------------------------------------------------
 
 
 # make sure recycled bin exists
@@ -198,7 +323,7 @@ if [[ ! -e $SAFE_RM_TRASH ]]; then
   echo -n "(yes/no): "
 
   read answer
-  if [[ $answer = "yes" || ! -n $anwser ]]; then
+  if [[ $answer == "yes" || ! -n $anwser ]]; then
     mkdir -p "$SAFE_RM_TRASH"
   else
     echo "Canceled!"
@@ -206,59 +331,79 @@ if [[ ! -e $SAFE_RM_TRASH ]]; then
   fi
 fi
 
+
+check_return_status(){
+  local status=$?
+  if [[ $status -ne "0" ]]; then
+    debug "$LINENO: last command returned status $status"
+    EXIT_CODE=$status
+  fi
+}
+
 # try to remove a file or directory
 remove(){
   local file=$1
 
   # if is dir
-  if [[ -d $file ]]; then
+  if [[ -d "$file" && ! -L "$file" ]]; then
 
-  # if a directory, and without '-r' option
-  if [[ ! -n $OPT_RECURSIVE ]]; then
-    debug "$LINENO: $file: is a directory"
-    echo "$COMMAND: $file: is a directory"
-    return 1
-  fi
-
-  if [[ $file = './' ]]; then
-    echo "$COMMAND: $file: Invalid argument"
-    return 1
-  fi
-
-  if [[ $OPT_INTERACTIVE = 1 ]]; then
-    echo -n "examine files in directory $file? "
-    read answer
+    # if a directory, and without '-r' option
+    if [[ ! -n $OPT_RECURSIVE ]]; then
+      # if with '-d' option, and is an empty dir
+      if [[ -n $OPT_EMPTY_DIR && ! $(ls -A "$file") ]]; then
+          debug "$LINENO: trash an empty directory $file"
+          trash "$file"
+          return
+      fi
 
-    # actually, as long as the answer start with 'y', the file will be removed
-    # default to no remove
-    if [[ ${answer:0:1} =~ [yY] ]]; then
+      debug "$LINENO: $file: is a directory"
+      error "$COMMAND: $file: is a directory"
+      return 1
+    fi
 
-      # if choose to examine the dir, recursively check files first
-      recursive_remove "$file"
+    if [[ "$file" == './' ]]; then
+      echo "$COMMAND: $file: Invalid argument"
+      return 1
+    fi
 
-      # interact with the dir at last
-      echo -n "remove $file? "
+    if [[ "$OPT_INTERACTIVE" == 1 ]]; then
+      echo -n "examine files in directory $file? "
       read answer
+
+      # actually, as long as the answer start with 'y', the file will be removed
+      # default to no remove
       if [[ ${answer:0:1} =~ [yY] ]]; then
-        [[ $(ls -A "$file") ]] && {
-          echo "$COMMAND: $file: Directory not empty"
 
-          return 1
+        # if choose to examine the dir, recursively check files first
+        recursive_remove "$file"
 
-        } || {
-          trash "$file"
-          debug "$LINENO: trash returned status $?"
-        }
+        # interact with the dir at last
+        echo -n "remove $file? "
+        read answer
+        if [[ ${answer:0:1} =~ [yY] ]]; then
+          [[ $(ls -A "$file") ]] && {
+            echo "$COMMAND: $file: Directory not empty"
+
+            return 1
+
+          } || {
+            trash "$file"
+            debug "$LINENO: trash returned status $?"
+          }
+        fi
       fi
+    else
+      # The file
+      # - is a symbolic link
+      # - is a file
+      # - does not exist
+      trash "$file"
+      debug "$LINENO: trash returned status $?"
     fi
-  else
-    trash "$file"
-    debug "$LINENO: trash returned status $?"
-  fi
 
   # if is a file
   else
-    if [[ "$OPT_INTERACTIVE" = 1 ]]; then
+    if [[ "$OPT_INTERACTIVE" == 1 ]]; then
       echo -n "remove $file? "
       read answer
       if [[ ${answer:0:1} =~ [yY] ]]; then
@@ -288,55 +433,249 @@ recursive_remove(){
 }
 
 
-# trash a file or dir directly
 trash(){
-  debug "trash $1"
+  local target=$1
+
+  if [[ -n $SAFE_RM_PERM_DEL_FILES_IN_TRASH ]]; then
+    if [[ "$target" == "$SAFE_RM_TRASH"* ]]; then
+      # If the target is already in the trash, delete it permanently
+      /bin/rm -rf "$target"
+    else
+      do_trash "$target"
+    fi
+  else
+    do_trash "$target"
+  fi
+
+  check_return_status
+}
+
+
+do_trash(){
+  local target=$1
+
+  debug "$LINENO: trash $target"
+
+  if is_protected "$target"; then
+    error "\"$target\" is protected by your configuration"
+    return 1
+  fi
+
+  if [[ -n $SAFE_RM_USE_APPLESCRIPT ]]; then
+    applescript_trash "$target"
+  elif [[ "$OS_TYPE" == "MacOS" ]]; then
+    mac_trash "$target"
+  else
+    linux_trash "$target"
+  fi
+}
+
+
+get_absolute_path(){
+  echo $(cd "$(dirname "$1")" && pwd)/$(basename "$1")
+}
 
-  # origin file path
-  local file=$1
 
-  # the first parameter to be passed to `mv`
-  local move=$file
-  local base=$(basename "$file")
-  local travel=
+# Returns
+# - 0: the target is protected
+# - 1: the target is not protected
+is_protected(){
+  if [[ ! -n $SAFE_RM_PROTECTED_RULES ]]; then
+    # If no protected rules are set, the target is not protected
+    return 1
+  fi
+
+  local target=$1
+  local abs_path=$(get_absolute_path "$target")
+
+  # /path/to/foo -> path/to/foo
+  local rel_path=${abs_path#/}
+
+  debug "$LINENO: check whether $rel_path is protected"
+
+  local ignored=$(git -C "$SAFE_RM_CONFIG_ROOT" check-ignore -v --no-index "$rel_path")
+
+  debug "$LINENO: git check-ignore result: $ignored"
+
+  if [[ -n "$ignored" ]]; then
+    return 0
+  else
+    return 1
+  fi
+}
+
+
+applescript_trash(){
+  local target=$1
+
+  [[ "$OPT_VERBOSE" == 1 ]] && list_files "$target"
+
+  debug "$LINENO: osascript delete $target"
+
+  osascript -e "tell application \"Finder\" to delete (POSIX file \"$target\" as alias)" &> /dev/null
+
+  # TODO: handle osascript errors
+  return 0
+}
+
+
+_short_time_ret=
+short_time(){
+  _short_time_ret=$(date +%H.%M.%S)
+}
+
+_mac_trash_path_ret=
+check_mac_trash_path(){
+  local path=$1
+  local ext=$2
+  local full_path="$path$ext"
+
+  # if already in the trash
+  if [[ -e "$full_path" ]]; then
+    debug "$LINENO: $full_path already exists"
+
+    # renew $_short_time_ret
+    short_time
+    check_mac_trash_path "$path $_short_time_ret" "$ext"
+  else
+    _mac_trash_path_ret=$full_path
+  fi
+}
+
+
+_traveled=
+_to_move=
+
+check_target_to_move(){
+  _traveled=
+  _to_move=$1
 
   # basename ./       -> .
   # basename ../      -> ..
   # basename ../abc   -> abc
   # basename ../.abc  -> .abc
-  if [[ -d "$file" && ${base:0:1} = '.' ]]; then
-    # then file must be a relative dir
-    cd $file
-
-    # pwd can't be piped?
-    move=$(pwd)
-    move=$(basename "$move")
-    cd ..
-    travel=1
+  if [[ -d "$_to_move" ]]; then
+    # We don't know whether a relative path is the pwd or not
+    if [[ "${_to_move:0:1}" == '.' || "$_to_move" == "$__DIRNAME" ]]; then
+      cd "$_to_move"
+
+      # pwd can't be piped?
+      local current=$(pwd)
+      _to_move=$(basename "$current")
+
+      # We can not `mv` a dir that is the pwd,
+      #   or it will throw an "Operation not permitted" error,
+      #   so we have to `cd` to the parent dir first
+      cd ..
+      _traveled=1
+    fi
   fi
+}
+
+# trash a file or dir directly
+mac_trash(){
+  check_target_to_move "$1"
+  local move=$_to_move
+  local base=$(basename "$move")
+
+  # foo.jpg => "foo" + ".jpg"
+  # foo => "foo" + ""
+
+  local name="${base%.*}"
+  local ext="${base##*.}"
+
+  if [[ "$name" == "$ext" ]]; then
+    ext=
+  else
+    ext=".$ext"
+  fi
+
+  # foo.jpg => "foo 12.34.56.jpg"
+
+  check_mac_trash_path "$SAFE_RM_TRASH/$name" "$ext"
+  local trash_path=$_mac_trash_path_ret
 
-  local trash_name=$SAFE_RM_TRASH/$base
+  [[ "$OPT_VERBOSE" == 1 ]] && list_files "$1"
+
+  debug "$LINENO: mv $move to $trash_path"
+  mv "$move" "$trash_path"
+
+  [[ "$_traveled" == 1 ]] && cd $__DIRNAME &> /dev/null
+
+  # default status
+  return 0
+}
+
+
+# Check if the base name already exists in the trash
+# If it does, foo -> foo.1
+# If foo.1 exists, foo.1 -> foo.2
+check_linux_trash_base(){
+  local base=$1
+  local trash="$SAFE_RM_TRASH/files"
+  local path="$trash/$base"
 
   # if already in the trash
-  if [[ -e "$trash_name" ]]; then
-    # renew $TIME
-    date_time
-    trash_name="$trash_name-$TIME"
+  if [[ -e "$path" ]]; then
+    debug "$LINENO: $path already exists"
+
+    local max_n=0
+    local num=
+
+    while IFS= read -r file; do
+      if [[ $file =~ ${filename}\.([0-9]+)$ ]]; then
+          # Remove leading zeros and make sure the number is in base 10
+          num=$((10#${BASH_REMATCH[1]}))
+          if ((num > max_n)); then
+              max_n=$num
+          fi
+      fi
+    done < <(find "$trash" -maxdepth 1)
+
+    (( max_n += 1 ))
+
+    echo "$base.$max_n"
+  else
+    echo "$base"
   fi
+}
+
+
+# trash a file or dir directly for linux
+# - move the target into
+linux_trash(){
+  check_target_to_move "$1"
+  local move=$_to_move
+  local base=$(basename "$move")
+
+  base=$(check_linux_trash_base "$base")
+
+  local trash_path="$SAFE_RM_TRASH/files/$base"
 
-  [[ "$OPT_VERBOSE" = 1 ]] && list_files "$file"
+  [[ "$OPT_VERBOSE" == 1 ]] && list_files "$1"
 
-  debug "mv $move to $trash_name"
-  mv "$move" "$trash_name"
+  # Move the target into the trash
+  debug "$LINENO: mv $move to $trash_path"
+  mv "$move" "$trash_path"
 
-  [[ "$travel" = 1 ]] && cd $__DIRNAME &> /dev/null
+  # Save linux trash info
+  local info_path="$SAFE_RM_TRASH/info/$base.trashinfo"
+  local trash_time=$(date +%Y-%m-%dT%H:%M:%S)
+  cat > "$info_path" <<EOF
+[Trash Info]
+Path=$move
+DeletionDate=$trash_time
+EOF
+
+  [[ "$_traveled" == 1 ]] && cd $__DIRNAME &> /dev/null
 
-  #default status
   return 0
 }
 
+
 # list all files and maintain outward sequence
-# we can't just use `find $file`, 'coz `find` act a inward searching, unlike rm -v
+# we can't just use `find $file`,
+#   'coz `find` act a inward searching, unlike rm -v
 list_files(){
   if [[ -d "$1" ]]; then
     local list=$(ls -A "$1")
@@ -352,43 +691,39 @@ list_files(){
 
 
 # debug: get $FILE_NAME array length
-debug "${#FILE_NAME[@]} files or directory to process: ${FILE_NAME[@]}"
+debug "$LINENO: ${#FILE_NAME[@]} files or directory to process: ${FILE_NAME[@]}"
 
-# test remove interactive_once: ask for 3 or more files or with recorsive option
-if [[ (${#FILE_NAME[@]} > 2 || $OPT_RECURSIVE = 1) && $OPT_INTERACTIVE_ONCE = 1 ]]; then
+# test remove interactive_once: ask for 3 or more files or with recursive option
+if [[ (${#FILE_NAME[@]} > 2 || $OPT_RECURSIVE == 1) && $OPT_INTERACTIVE_ONCE == 1 ]]; then
   echo -n "$COMMAND: remove all arguments? "
   read answer
 
   # actually, as long as the answer start with 'y', the file will be removed
   # default to no remove
   if [[ ! ${answer:0:1} =~ [yY] ]]; then
-    debug "EXIT_CODE $EXIT_CODE"
-    exit $EXIT_CODE
+    do_exit $LINENO
   fi
 fi
 
 for file in "${FILE_NAME[@]}"; do
-  debug "result file $file"
+  debug "$LINENO: result file $file"
 
-  if [[ $file = "/" ]]; then
-    echo "it is dangerous to operate recursively on /"
-    echo "are you insane?"
+  if [[ $file == "/" ]]; then
+    error "it is dangerous to operate recursively on /"
+    error "are you insane?"
     EXIT_CODE=1
-
-    # Exit immediately
-    debug "EXIT_CODE $EXIT_CODE"
-    exit $EXIT_CODE
+    continue
   fi
 
-  if [[ $file = "." || $file = ".." ]]; then
-    echo "$COMMAND: \".\" and \"..\" may not be removed"
+  if [[ $file == "." || $file == ".." ]]; then
+    error "$COMMAND: \".\" and \"..\" may not be removed"
     EXIT_CODE=1
     continue
   fi
 
-  #the same check also apply on /. /..
-  if [[ $(basename "$file") = "." || $(basename "$file") = ".." ]]; then
-    echo "$COMMAND: \".\" and \"..\" may not be removed"
+  # the same check also apply on /. /..
+  if [[ $(basename "$file") == "." || $(basename "$file") == ".." ]]; then
+    error "$COMMAND: \".\" and \"..\" may not be removed"
     EXIT_CODE=1
     continue
   fi
@@ -397,23 +732,22 @@ for file in "${FILE_NAME[@]}"; do
   ls_result=$(ls -d "$file" 2> /dev/null)
 
   # debug
-  debug "ls_result: $ls_result"
+  debug "$LINENO: ls_result: $ls_result"
 
   if [[ -n "$ls_result" ]]; then
     for file in "$ls_result"; do
       remove "$file"
       status=$?
-      debug "remove returned status: $status"
+      debug "$LINENO: remove returned status: $status"
 
       if [[ ! $status == 0 ]]; then
         EXIT_CODE=1
       fi
     done
-  else
-    echo "$COMMAND: $file: No such file or directory"
+  elif [[ -z "$OPT_FORCE" ]]; then
+    error "$COMMAND: $file: No such file or directory" >&2
     EXIT_CODE=1
   fi
 done
 
-debug "EXIT_CODE $EXIT_CODE"
-exit $EXIT_CODE
+do_exit $LINENO