fixes #37: rm.sh: supports -d

bin/rm.sh

@@ -233,6 +233,7 @@ OPT_INTERACTIVE=
 OPT_INTERACTIVE_ONCE=
 OPT_RECURSIVE=
 OPT_VERBOSE=
+OPT_EMPTY_DIR=
 
 # parse options
 for arg in ${ARG[@]}; do
@@ -270,6 +271,10 @@ for arg in ${ARG[@]}; do
     OPT_VERBOSE=1;      debug "$LINENO: verbose      : $arg"
     ;;
 
+  -d|--directory)
+    OPT_EMPTY_DIR=1;    debug "$LINENO: empty dir    : $arg"
+    ;;
+
   *)
     invalid_option $arg
     ;;
@@ -303,8 +308,15 @@ remove(){
 
     # 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
+
       debug "$LINENO: $file: is a directory"
-      echo "$COMMAND: $file: is a directory"
+      error "$COMMAND: $file: is a directory"
       return 1
     fi
 

test/cases.js

@@ -208,4 +208,23 @@ module.exports = (
         result_no_f.stderr
       }`)
   })
+
+  test(`${des_prefix}: removes an empty directory: -d`, async t => {
+    const {
+      createDir,
+      runRm,
+      pathExists
+    } = t.context
+
+    const dirpath = await createDir()
+    const result1 = await runRm([dirpath])
+
+    t.is(result1.code, 1, 'exit code should be 1')
+    t.true(result1.stderr.includes('is a directory'), 'stderr should include "is a directory"')
+
+    const result2 = await runRm(['-d', dirpath])
+
+    assertEmptySuccess(t, result2)
+    t.false(await pathExists(dirpath), 'directory should be removed')
+  })
 }