Browse Source

fix(common-aliases)!: don't overshadow `fd` if installed (#9162)

BREAKING CHANGE: in `common-aliases`, the `fd` alias won't be defined if `fd` is installed (https://github.com/sharkdp/fd).
Marc Cornellà 3 years ago
parent
commit
e4082a951f

+ 3 - 1
plugins/common-aliases/README.md

@@ -40,11 +40,13 @@ plugins=(... common-aliases)
 
 | Alias | Command                                             | Description                             |
 |-------|-----------------------------------------------------|-----------------------------------------|
-| fd    | `find . -type d -name`                              | Find a directory with the given name    |
+| fd\*  | `find . -type d -name`                              | Find a directory with the given name    |
 | ff    | `find . -type f -name`                              | Find a file with the given name         |
 | grep  | `grep --color`                                      | Searches for a query string             |
 | sgrep | `grep -R -n -H -C 5 --exclude-dir={.git,.svn,CVS}`  | Useful for searching within files       |
 
+\* Only if the [`fd`](https://github.com/sharkdp/fd) command isn't installed.
+
 ### Other Aliases
 
 | Alias     | Command             | Description                                                 |

+ 1 - 1
plugins/common-aliases/common-aliases.plugin.zsh

@@ -34,7 +34,7 @@ alias -g P="2>&1| pygmentize -l pytb"
 
 alias dud='du -d 1 -h'
 alias duf='du -sh *'
-alias fd='find . -type d -name'
+(( $+commands[fd] )) || alias fd='find . -type d -name'
 alias ff='find . -type f -name'
 
 alias h='history'