Commit dfd1b4f8 authored by Muhannad Fakhouri's avatar Muhannad Fakhouri Committed by Marc Cornellà
Browse files

adb: improve `adb -s` completion to show helpful info (#7532)

Currently it shows for example the following:

  DEVICE_ID  -- transport_id:2

which doesn't really ease device selection. I've adapted the awk script to print
device name with it's model name, see the example below:

  DEVICE_ID  -- Pixel_3(blueline)
parent 424b2476
...@@ -49,7 +49,12 @@ _arguments \ ...@@ -49,7 +49,12 @@ _arguments \
case "$state" in case "$state" in
specify_device) specify_device)
_values -C 'devices' ${$(adb devices -l|awk 'NR>1&& $1 \ _values -C 'devices' ${$(adb devices -l|awk 'NR>1&& $1 \
{sub(/ +/," ",$0);gsub(":","\\:",$1); printf "%s[%s] ",$1, $NF}'):-""} {sub(/ +/," ",$0); \
gsub(":","\\:",$1); \
for(i=1;i<=NF;i++) {
if($i ~ /model:/) { split($i,m,":") } \
else if($i ~ /product:/) { split($i,p,":") } } \
printf "%s[%s(%s)] ",$1, p[2], m[2]}'):-""}
return return
;; ;;
esac esac
...@@ -59,4 +64,4 @@ if (( CURRENT == 1 )); then ...@@ -59,4 +64,4 @@ if (( CURRENT == 1 )); then
return return
fi fi
_files _files
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment