From 2be9cac81b96aa8e51b601d7702c46ad77b59b8e Mon Sep 17 00:00:00 2001 From: Marc K Date: Thu, 20 Oct 2016 10:27:35 +0200 Subject: [PATCH] envsetup: dopush: allow (symbolic) host names for adb connect Change-Id: Icfab874abab64b0a3e5e63091cb6c25dd9630737 Signed-off-by: Marc K --- build/envsetup.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/envsetup.sh b/build/envsetup.sh index a5b8b970..72bdfd40 100644 --- a/build/envsetup.sh +++ b/build/envsetup.sh @@ -789,7 +789,8 @@ function dopush() if (adb shell getprop ro.cm.device | grep -q "$CM_BUILD") || [ "$FORCE_PUSH" = "true" ]; then # retrieve IP and PORT info if we're using a TCP connection - TCPIPPORT=$(adb devices | egrep '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+:[0-9]+[^0-9]+' \ + TCPIPPORT=$(adb devices \ + | egrep '^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9]):[0-9]+[^0-9]+' \ | head -1 | awk '{print $1}') adb root &> /dev/null sleep 0.3