Merge "Bash completion: Fix ls options and also support "shell cat""
am: 9d7a46cfa2
* commit '9d7a46cfa2bdf2cfa681082488b60b35fdc46059':
Bash completion: Fix ls options and also support "shell cat"
diff --git a/bash_completion/adb.bash b/bash_completion/adb.bash
index f5c7105..4b10e14 100644
--- a/bash_completion/adb.bash
+++ b/bash_completion/adb.bash
@@ -208,7 +208,10 @@
i=$((i+1))
case "$cur" in
ls)
- _adb_shell_ls $serial $i
+ _adb_shell_file_command $serial $i "--color -A -C -F -H -L -R -S -Z -a -c -d -f -h -i -k -l -m -n -p -q -r -s -t -u -x -1"
+ ;;
+ cat)
+ _adb_shell_file_command $serial $i "-h -e -t -u -v"
;;
dumpsys)
_adb_cmd_shell_dumpsys "$serial" $i
@@ -345,8 +348,8 @@
COMPREPLY=( ${COMPREPLY[@]:-} $(compgen -W "${packages}" -- "${cur}") )
}
-_adb_shell_ls() {
- local serial i cur file
+_adb_shell_file_command() {
+ local serial i cur file options
local -a args
serial=$1
@@ -354,6 +357,7 @@
if [ "$serial" != "none" ]; then
args=(-s $serial)
fi
+ options=$3
where=OPTIONS
for ((; i <= COMP_CWORD; i++)); do
@@ -376,8 +380,8 @@
case $where in
OPTIONS)
- COMPREPLY=( $(compgen -W "$OPTIONS" -- "$cur") )
- _adb_util_list_files $serial "$file"
+ unset IFS
+ COMPREPLY=( $(compgen -W "$options" -- "$cur") )
;;
FILE)
_adb_util_list_files $serial "$file"
