Bypass alias for grep in the tapas command.

Change-Id: I82705535bda927ddc7e9aebb9610d712b68a50d2
This commit is contained in:
Jeff Hamilton 2011-11-18 17:15:25 -06:00
parent 877bddc604
commit 293f9392ba
2 changed files with 4 additions and 4 deletions

View File

@ -1104,7 +1104,7 @@ $(hide) ldir=$(PRIVATE_INTERMEDIATES_DIR)/WHOLE/$(basename $(notdir $(1)))_objs;
rm -rf $$ldir; \
mkdir -p $$ldir; \
filelist=; \
for f in `$(HOST_AR) t $(1) | grep '\.o$$'`; do \
for f in `$(HOST_AR) t $(1) | \grep '\.o$$'`; do \
$(HOST_AR) p $(1) $$f > $$ldir/$$f; \
filelist="$$filelist $$ldir/$$f"; \
done ; \

View File

@ -502,8 +502,8 @@ complete -F _lunch lunch
# Run tapas with one ore more app names (from LOCAL_PACKAGE_NAME)
function tapas()
{
local variant=$(echo -n $(echo $* | xargs -n 1 echo | grep -E '^(user|userdebug|eng)$'))
local apps=$(echo -n $(echo $* | xargs -n 1 echo | grep -E -v '^(user|userdebug|eng)$'))
local variant=$(echo -n $(echo $* | xargs -n 1 echo | \grep -E '^(user|userdebug|eng)$'))
local apps=$(echo -n $(echo $* | xargs -n 1 echo | \grep -E -v '^(user|userdebug|eng)$'))
if [ $(echo $variant | wc -w) -gt 1 ]; then
echo "tapas: Error: Multiple build variants supplied: $variant"
@ -1015,7 +1015,7 @@ function godir () {
echo ""
fi
local lines
lines=($(grep "$1" $T/filelist | sed -e 's/\/[^/]*$//' | sort | uniq))
lines=($(\grep "$1" $T/filelist | sed -e 's/\/[^/]*$//' | sort | uniq))
if [[ ${#lines[@]} = 0 ]]; then
echo "Not found"
return