am 5a4cc0da: Merge "fix uses of grep in envsetup.h" into klp-dev
* commit '5a4cc0da02e2e2bfde7b07b612d57eecd8ade64e':
fix uses of grep in envsetup.h
diff --git a/envsetup.sh b/envsetup.sh
index 92c4931..bd66aed 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -805,7 +805,7 @@
local EXE="$1"
if [ "$EXE" ] ; then
- qpid | grep "$prepend$EXE$append"
+ qpid | \grep "$prepend$EXE$append"
else
adb shell ps \
| tr -d '\r' \
@@ -826,7 +826,7 @@
if [ "$EXE" ] ; then
local PID=`adb shell ps \
| tr -d '\r' \
- | grep "$prepend$EXE$append" \
+ | \grep "$prepend$EXE$append" \
| sed -e 's/^[^ ]* *\([0-9]*\).*$/\1/'`
echo "$PID"
else
@@ -932,7 +932,7 @@
if [[ ! "$PID" =~ ^[0-9]+$ ]] ; then
# that likely didn't work because of returning multiple processes
# try again, filtering by root processes (don't contain colon)
- PID=`adb shell ps | grep $3 | grep -v ":" | awk '{print $2}'`
+ PID=`adb shell ps | \grep $3 | \grep -v ":" | awk '{print $2}'`
if [[ ! "$PID" =~ ^[0-9]+$ ]]
then
echo "Couldn't resolve '$3' to single PID"