commit 46d9bf8f9a013f86e3588f35b08da213698425ed
author David Gross <dgross@google.com> Thu May 18 18:13:00 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 18 18:13:03 2017 +0000
tree 31b94a7faba1d2ead0278d19397bc5e9ee4bfad6
parent a0203a65445c82e2a45474e1a9ac9d1b9e12195b
parent d1d6fc5cff0cf79bc2488e376eb1303fa13bf33d

Merge "Teach mgrep to find soong/*.go files."

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index a31b9d8..b71a825 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -1241,7 +1241,7 @@
     Darwin)
         function mgrep()
         {
-            find -E . -name .repo -prune -o -name .git -prune -o -path ./out -prune -o -type f -iregex '.*/(Makefile|Makefile\..*|.*\.make|.*\.mak|.*\.mk|.*\.bp)' \
+            find -E . -name .repo -prune -o -name .git -prune -o -path ./out -prune -o \( -iregex '.*/(Makefile|Makefile\..*|.*\.make|.*\.mak|.*\.mk|.*\.bp)' -o -regex '(.*/)?soong/[^/]*.go' \) -type f \
                 -exec grep --color -n "$@" {} +
         }
 
@@ -1255,7 +1255,7 @@
     *)
         function mgrep()
         {
-            find . -name .repo -prune -o -name .git -prune -o -path ./out -prune -o -regextype posix-egrep -iregex '(.*\/Makefile|.*\/Makefile\..*|.*\.make|.*\.mak|.*\.mk|.*\.bp)' -type f \
+            find . -name .repo -prune -o -name .git -prune -o -path ./out -prune -o \( -regextype posix-egrep -iregex '(.*\/Makefile|.*\/Makefile\..*|.*\.make|.*\.mak|.*\.mk|.*\.bp)' -o -regextype posix-extended -regex '(.*/)?soong/[^/]*.go' \) -type f \
                 -exec grep --color -n "$@" {} +
         }