safe-rm 3.0.0 → 3.1.0

package/Makefile

@@ -12,6 +12,3 @@ uninstall:
 	@echo "Please remove \"alias rm='$(PREFIX)/safe-rm'\" from your ~/.bashrc script"
 	@echo "and do 'unalias rm' from all your terminal sessions"
 	@echo "Successfully removed $(PREFIX)/safe-rm"
-
-test:
-	@echo "Testing safe-rm"

package/README.md

@@ -14,7 +14,7 @@
 
 [Safe-rm][safe-rm], a drop-in and much safer replacement of the unix [`rm`][rm] command with **ALMOST FULL** features of the original [`rm`][rm].
 
-The project was initially developed for Mac OS X, and then tested on Linux.
+The project was initially developed on Mac OS X and has been continuously used by myself since then, with later testing conducted on Linux. If you encounter any issues during use, please feel free to [submit an issue](https://github.com/kaelzhang/shell-safe-rm/issues/new).
 
 ## Features
 - Supports both MacOS and Linux with full test coverage.
@@ -147,7 +147,9 @@ In `~/.safe-rm/config`
 export SAFE_RM_USE_APPLESCRIPT=no
 ```
 
-### Change the Default Trach Bin Other Than System Default
+By default, on MacOS, `safe-rm` uses AppleScript as much as possible so that removed files could be put back from system Trash app.
+
+### Change the Default Trash Bin Other Than System Default
 
 ```sh
 export SAFE_RM_TRASH=/path/to/trash
@@ -190,8 +192,8 @@ $ safe-rm -rf /path/to
 To keep the performance of `safe-rm` and avoid conducting unnecessary file system traversing, this would not prevent `/path/to/be/protected/foo` from removing.
 
 Pay **ATTENTION** that:
-- Before adding protected rules, i.e. placing the `.gitignore` inside the `"~/.safe-rm/"` directory, it requires `git` to be installed in your environment
-- The protected rules file applies to the root directory (/), which This means that the patterns defined within it need to be relative to the root directory.
+- Before adding protected rules, i.e. placing the `".gitignore"` inside the `"~/.safe-rm/"` directory, it requires `git` to be installed in your environment
+- The `".gitignore"` patterns apply to the root directory (`"/"`), which means that the patterns defined within it need to be relative to the root directory.
 - Avoid adding `/` in the protected rules file, or everything will be protected
 
 

package/bin/rm.sh

@@ -3,20 +3,27 @@
 # Basic configuration
 # ------------------------------------------------------------------------------
 
-DEFAULT_SAFE_RM_CONFIG="$HOME/.safe-rm/config"
+# You could modify the root config directory of safe-rm by using
+# ```sh
+# $ export SAFE_RM_CONFIG_ROOT=/path/to/safe-rm-config
+# ```
+if [[ -n $XDG_CONFIG_HOME && -d "$XDG_CONFIG_HOME/safe-rm" ]]; then
+  # If XDG_CONFIG_HOME is set, use it as the configuration root
+  SAFE_RM_CONFIG_ROOT=${SAFE_RM_CONFIG_ROOT:="$XDG_CONFIG_HOME/safe-rm"}
+else
+  SAFE_RM_CONFIG_ROOT=${SAFE_RM_CONFIG_ROOT:="$HOME/.safe-rm"}
+fi
 
 # 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"}
+SAFE_RM_CONFIG=${SAFE_RM_CONFIG:="$SAFE_RM_CONFIG_ROOT/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:=}
 

package/package.json

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