Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c0e18ee authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Include .proto in sgrep()" am: 701cb0c0 am: 0a4f5e99

Change-Id: I8a4eb6ef81dabd61bfa4c4f46dd3f269a54f2a76
parents 117e454c 0a4f5e99
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -954,7 +954,7 @@ case `uname -s` in
    Darwin)
        function sgrep()
        {
            find -E . -name .repo -prune -o -name .git -prune -o  -type f -iregex '.*\.(c|h|cc|cpp|hpp|S|java|xml|sh|mk|aidl|vts)' \
            find -E . -name .repo -prune -o -name .git -prune -o  -type f -iregex '.*\.(c|h|cc|cpp|hpp|S|java|xml|sh|mk|aidl|vts|proto)' \
                -exec grep --color -n "$@" {} +
        }

@@ -962,7 +962,7 @@ case `uname -s` in
    *)
        function sgrep()
        {
            find . -name .repo -prune -o -name .git -prune -o  -type f -iregex '.*\.\(c\|h\|cc\|cpp\|hpp\|S\|java\|xml\|sh\|mk\|aidl\|vts\)' \
            find . -name .repo -prune -o -name .git -prune -o  -type f -iregex '.*\.\(c\|h\|cc\|cpp\|hpp\|S\|java\|xml\|sh\|mk\|aidl\|vts\|proto\)' \
                -exec grep --color -n "$@" {} +
        }
        ;;