p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 5a4cc0da: Merge "fix uses of grep in envsetup.h" into klp-dev 

* commit '5a4cc0da02e2e2bfde7b07b612d57eecd8ade64e':
  fix uses of grep in envsetup.h
This commit is contained in:
Mathias Agopian 2013-08-27 15:11:10 -07:00 committed by Android Git Automerger
parent bf05f6cc3e 5a4cc0da02
commit 54a8173445
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
envsetup.sh
View File

@ -805,7 +805,7 @@ function qpid() {
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 @@ function pid()
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 @@ function gdbclient()
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"