Prechádzať zdrojové kódy

Make grep flags -i,-l and --color work correctly

George Jones 1 rok pred
rodič
commit
3b557f82f0
1 zmenil súbory, kde vykonal 8 pridanie a 2 odobranie
  1. 8 2
      rc.local/find-aliases.sh

+ 8 - 2
rc.local/find-aliases.sh

@@ -56,12 +56,18 @@ function gorg (
     WHERE=${WHERE:-$HOME};
 
     if [[ $WHAT == "-h" ]]; then
-        info "Usage: [FLAGS=-i] [EXT=.org] [WHERE=$HOME] gorg [WHAT [AGE]]"
+        info "Usage: [FLAGS=--color=always] [EXT=.org] [WHERE=$HOME] gorg [WHAT [AGE]]"
         exit 1
     fi
 
+    COLOR="--color=always"
+
+    if [[ "$FLAGS" != "" ]]; then
+       unset COLOR
+    fi
+
     AGE=${2:-7};
     [[ -v DEBUG ]] && set -x
-    find "${WHERE}" -xdev -type f -name \*."${EXT:-org}" -mtime -"${AGE}" -exec grep "${FLAGS:-}" --color=always -H -e  "${WHAT}" \{\} \; |& grep -v "No such file"
+    find "${WHERE}" -xdev -type f -name \*."${EXT:-org}" -mtime -"${AGE}" -exec grep ${COLOR:-} ${FLAGS:-} -H -e    "${WHAT}" \{\} \; |& grep -v "No such file"
     [[ -v DEBUG ]] && set +x
 )