From 46cbd200988a650be9a595e095af92c045f8f522 Mon Sep 17 00:00:00 2001 From: Jeff Brown Date: Sat, 26 Jul 2014 15:15:41 -0700 Subject: [PATCH] Tweak sgrep to add cc and aidl files. Also add it to the help list since it was missing. Change-Id: I11403e63bc421fd146ad88452eac05043eacabc3 --- envsetup.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/envsetup.sh b/envsetup.sh index 29e4c4c02c..da7b6b3299 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -14,6 +14,7 @@ Invoke ". build/envsetup.sh" from your shell to add the following functions to y - ggrep: Greps on all local Gradle files. - jgrep: Greps on all local Java files. - resgrep: Greps on all local res/*.xml files. +- sgrep: Greps on all local source files. - godir: Go to the directory containing a file. Look at the source to view more functions. The complete list is: @@ -21,7 +22,7 @@ EOF T=$(gettop) local A A="" - for i in `cat $T/build/envsetup.sh | sed -n "/^function /s/function \([a-z_]*\).*/\1/p" | sort`; do + for i in `cat $T/build/envsetup.sh | sed -n "/^[ \t]*function /s/function \([a-z_]*\).*/\1/p" | sort | uniq`; do A="$A $i" done echo $A @@ -1091,14 +1092,14 @@ case `uname -s` in Darwin) function sgrep() { - find -E . -name .repo -prune -o -name .git -prune -o -type f -iregex '.*\.(c|h|cpp|S|java|xml|sh|mk)' -print0 | xargs -0 grep --color -n "$@" + find -E . -name .repo -prune -o -name .git -prune -o -type f -iregex '.*\.(c|h|cc|cpp|S|java|xml|sh|mk|aidl)' -print0 | xargs -0 grep --color -n "$@" } ;; *) function sgrep() { - find . -name .repo -prune -o -name .git -prune -o -type f -iregex '.*\.\(c\|h\|cpp\|S\|java\|xml\|sh\|mk\)' -print0 | xargs -0 grep --color -n "$@" + find . -name .repo -prune -o -name .git -prune -o -type f -iregex '.*\.\(c\|h\|cc\|cpp\|S\|java\|xml\|sh\|mk\|aidl\)' -print0 | xargs -0 grep --color -n "$@" } ;; esac