From c99844d84891076dceb5638bd6f4ad1599358cea Mon Sep 17 00:00:00 2001
From: kang <kjxstar@gmail.com>
Date: Sun, 17 Jun 2018 06:07:03 +0800
Subject: [PATCH] adb: fix `adb -s` device completion (#6489)

---
 plugins/adb/_adb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/adb/_adb b/plugins/adb/_adb
index 8cbf6593c..e3c20d751 100644
--- a/plugins/adb/_adb
+++ b/plugins/adb/_adb
@@ -48,8 +48,8 @@ _arguments \
 
 case "$state" in
 	specify_device)
-	_values  'devices' $(adb devices -l|awk 'NR>1&& $1 ~ /^[a-zA-Z0-9].*$/ \
-		{printf "%s[%s] ",$1,$6 }')
+	_values -C 'devices' ${$(adb devices -l|awk 'NR>1&& $1 \
+		{sub(/ +/," ",$0);gsub(":","\\:",$1); printf "%s[%s] ",$1, $NF}'):-""}
 	return
 	;;
 esac