diff options
| author | LuK1337 <priv.luk@gmail.com> | 2015-12-01 14:53:23 +0100 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2015-12-06 23:48:44 -0800 |
| commit | 56041e7e54c7d56780c71bad9e5c02de80e18435 (patch) | |
| tree | ce9b97848cfcd4d9c2bfd2f36aa81786085c6a1c /envsetup.sh | |
| parent | 2d14f9873b89286715e974b76fd5159613eb2852 (diff) | |
| download | build-56041e7e54c7d56780c71bad9e5c02de80e18435.zip build-56041e7e54c7d56780c71bad9e5c02de80e18435.tar.gz build-56041e7e54c7d56780c71bad9e5c02de80e18435.tar.bz2 | |
dopush: Add support for OS X
* OS X's sed doesn't have `-r` parameter and requires
different color stripping regex.
Change-Id: I2438f0492b1b564be6b7596fa123fc17eb64b25f
Diffstat (limited to 'envsetup.sh')
| -rw-r--r-- | envsetup.sh | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/envsetup.sh b/envsetup.sh index 38c92d2..cb49f2a 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -2206,10 +2206,18 @@ function dopush() fi # Install: <file> - LOC="$(cat $OUT/.log | sed -r 's/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g' | grep '^Install: ' | cut -d ':' -f 2)" + if [ `uname` = "Linux" ]; then + LOC="$(cat $OUT/.log | sed -r 's/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g' | grep '^Install: ' | cut -d ':' -f 2)" + else + LOC="$(cat $OUT/.log | sed -E "s/"$'\E'"\[([0-9]{1,3}((;[0-9]{1,3})*)?)?[m|K]//g" | grep '^Install: ' | cut -d ':' -f 2)" + fi # Copy: <file> - LOC="$LOC $(cat $OUT/.log | sed -r 's/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g' | grep '^Copy: ' | cut -d ':' -f 2)" + if [ `uname` = "Linux" ]; then + LOC="$LOC $(cat $OUT/.log | sed -r 's/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g' | grep '^Copy: ' | cut -d ':' -f 2)" + else + LOC="$LOC $(cat $OUT/.log | sed -E "s/"$'\E'"\[([0-9]{1,3}((;[0-9]{1,3})*)?)?[m|K]//g" | grep '^Copy: ' | cut -d ':' -f 2)" + fi # If any files are going to /data, push an octal file permissions reader to device if [ -n "$(echo $LOC | egrep '(^|\s)/data')" ]; then |