safe-rm 3.1.3 → 3.1.4

package/bin/rm.sh

@@ -490,7 +490,11 @@ do_trash(){
 
 
 get_absolute_path(){
-  echo $(cd "$(dirname "$1")" && pwd)/$(basename "$1")
+  local dir
+  local base
+  dir=$(cd "$(dirname -- "$1")" && pwd)
+  base=$(basename -- "$1")
+  printf '%s/%s\n' "$dir" "$base"
 }
 
 
@@ -601,7 +605,7 @@ check_target_to_move(){
 mac_trash(){
   check_target_to_move "$1"
   local move=$_to_move
-  local base=$(basename "$move")
+  local base=$(basename -- "$move")
 
   # foo.jpg => "foo" + ".jpg"
   # foo => "foo" + ""
@@ -623,7 +627,7 @@ mac_trash(){
   [[ "$OPT_VERBOSE" == 1 ]] && list_files "$1"
 
   debug "$LINENO: mv $move to $trash_path"
-  mv "$move" "$trash_path"
+  mv -- "$move" "$trash_path"
   local status=$?
 
   [[ "$_traveled" == 1 ]] && cd "$__DIRNAME" &> /dev/null
@@ -672,7 +676,7 @@ check_linux_trash_base(){
 linux_trash(){
   check_target_to_move "$1"
   local move=$_to_move
-  local base=$(basename "$move")
+  local base=$(basename -- "$move")
 
   base=$(check_linux_trash_base "$base")
 
@@ -682,7 +686,7 @@ linux_trash(){
 
   # Move the target into the trash
   debug "$LINENO: mv $move to $trash_path"
-  mv "$move" "$trash_path"
+  mv -- "$move" "$trash_path"
   local move_status=$?
 
   if [[ $move_status -ne 0 ]]; then
@@ -763,28 +767,20 @@ for file in "${FILE_NAME[@]}"; do
   fi
 
   # the same check also apply on /. /..
-  if [[ $(basename "$file") == "." || $(basename "$file") == ".." ]]; then
+  if [[ $(basename -- "$file") == "." || $(basename -- "$file") == ".." ]]; then
     error "$COMMAND: \".\" and \"..\" may not be removed"
     EXIT_CODE=1
     continue
   fi
 
-  # deal with wildcard and also, redirect error output
-  ls_result=$(ls -d "$file" 2> /dev/null)
+  if [[ -e "$file" || -L "$file" ]]; then
+    remove "$file"
+    status=$?
+    debug "$LINENO: remove returned status: $status"
 
-  # debug
-  debug "$LINENO: ls_result: $ls_result"
-
-  if [[ -n "$ls_result" ]]; then
-    for file in "$ls_result"; do
-      remove "$file"
-      status=$?
-      debug "$LINENO: remove returned status: $status"
-
-      if [[ ! $status == 0 ]]; then
-        EXIT_CODE=1
-      fi
-    done
+    if [[ ! $status == 0 ]]; then
+      EXIT_CODE=1
+    fi
   elif [[ -z "$OPT_FORCE" ]]; then
     error "$COMMAND: $file: No such file or directory" >&2
     EXIT_CODE=1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "safe-rm",
-  "version": "3.1.3",
+  "version": "3.1.4",
   "description": "A much safer replacement of bash rm with nearly full functionalities and options of the rm command!",
   "bin": {
     "safe-rm": "./bin/rm.sh"

package/test/cases.js

@@ -447,4 +447,124 @@ fi
     t.false(await pathExists(link), 'symlink should be removed')
     t.true(await pathExists(target), 'target file should remain')
   })
+
+  !is_as(type) && test(`removes a dangling symlink`, async t => {
+    const {
+      source_path,
+      runRm
+    } = t.context
+
+    const missingTarget = path.join(source_path, 'missing-target')
+    const link = path.join(source_path, 'dangling_sym')
+    await fs.symlink(missingTarget, link)
+
+    const before = await fs.lstat(link)
+    t.true(before.isSymbolicLink(), 'should create symlink before remove')
+
+    const result = await runRm([link])
+
+    t.is(result.code, 0, 'exit code should be 0')
+    await t.throwsAsync(async () => fs.lstat(link), {
+      code: 'ENOENT'
+    })
+  })
+
+  !is_as(type) && test(`-r should not dereference a directory symlink`, async t => {
+    const {
+      createDir,
+      createFile,
+      runRm,
+      pathExists
+    } = t.context
+
+    const realDir = await createDir({
+      name: 'real-dir'
+    })
+
+    const keep = await createFile({
+      name: 'keep',
+      under: realDir
+    })
+
+    const link = path.join(path.dirname(realDir), 'real-dir-sym')
+    await fs.symlink(realDir, link)
+
+    const result = await runRm(['-r', link])
+
+    t.is(result.code, 0, 'exit code should be 0')
+    await t.throwsAsync(async () => fs.lstat(link), {
+      code: 'ENOENT'
+    })
+    t.true(await pathExists(realDir), 'target directory should remain')
+    t.true(await pathExists(keep), 'target content should remain')
+  })
+
+  !is_as(type) && test(`-ri should not dereference a directory symlink`, async t => {
+    const {
+      createDir,
+      createFile,
+      runRm,
+      pathExists
+    } = t.context
+
+    const realDir = await createDir({
+      name: 'real-dir-i'
+    })
+
+    const keep = await createFile({
+      name: 'keep-i',
+      under: realDir
+    })
+
+    const link = path.join(path.dirname(realDir), 'real-dir-sym-i')
+    await fs.symlink(realDir, link)
+
+    const result = await runRm(['-ri', link], {
+      input: ['y']
+    })
+
+    t.is(result.code, 0, 'exit code should be 0')
+    await t.throwsAsync(async () => fs.lstat(link), {
+      code: 'ENOENT'
+    })
+    t.true(await pathExists(realDir), 'target directory should remain')
+    t.true(await pathExists(keep), 'target content should remain')
+  })
+
+  !is_as(type) && test(`removes a file prefixed with "-" after --`, async t => {
+    const {
+      source_path,
+      createFile,
+      runRm,
+      pathExists
+    } = t.context
+
+    const name = '-dash-file'
+    await createFile({name})
+
+    const result = await runRm(['--', name], {
+      cwd: source_path
+    })
+
+    t.is(result.code, 0, 'exit code should be 0')
+    t.false(await pathExists(name), 'file should be removed')
+  })
+
+  !is_as(type) && test(`removes a file with newline in filename`, async t => {
+    const {
+      createFile,
+      runRm,
+      pathExists
+    } = t.context
+
+    const filename = 'line1\nline2'
+    const filepath = await createFile({
+      name: filename
+    })
+
+    const result = await runRm([filepath])
+
+    t.is(result.code, 0, 'exit code should be 0')
+    t.false(await pathExists(filepath), 'file should be removed')
+  })
 }

package/test/helper.js

@@ -60,7 +60,8 @@ const generateContextMethods = (
   function runRm (args, {
     input = [],
     command = rm_command,
-    env: arg_env = {}
+    env: arg_env = {},
+    cwd
   } = {}) {
     return new Promise((resolve, reject) => {
       const env = {
@@ -73,7 +74,8 @@ const generateContextMethods = (
       }
 
       const child = spawn(command, args, {
-        env
+        env,
+        cwd
       })
       let stdout = ''
       let stderr = ''