tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Adb and fastboot completion supports zsh users.

Browse source 
Builtin command "type" in zsh doesn't support -t option and this
is resolved by checking the shell type prior to sourcing them.
Instead of using "type -t" explicitly, check_type() knows the the
type of the current shell and behaves accordingly.

Bug: 110629292
Test: (zsh) source build/envsetup.sh && lunch aosp_arm
      (bash) source build/envsetup.sh && lunch aosp_arm

Change-Id: Ie39e130e9cc87135cfd522abedba11ad5ac25261
This commit is contained in:
Jim Tang 2018-06-19 19:11:48 +08:00
parent 17a02a33bb
commit 0bd3432c5b
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
adb/adb.bash
View file

@ -16,11 +16,11 @@
#
_adb() {
if ! type -t "$1" >/dev/null; then
if ! check_type "$1" >/dev/null; then
return
fi
if type -t _init_completion >/dev/null; then
if check_type _init_completion >/dev/null; then
_init_completion || return
fi
@ -435,7 +435,7 @@ _adb_util_list_files() {
fi
# Since we're probably doing file completion here, don't add a space after.
if [[ $(type -t compopt) = "builtin" ]]; then
if [[ $(check_type compopt) == "builtin" ]]; then
compopt -o nospace
fi
@ -451,7 +451,7 @@ _adb_util_complete_local_file()
xspec=$2
# Since we're probably doing file completion here, don't add a space after.
if [[ $(type -t compopt) = "builtin" ]]; then
if [[ $(check_type compopt) == "builtin" ]]; then
compopt -o plusdirs
if [[ "${xspec}" == "" ]]; then
COMPREPLY=( ${COMPREPLY[@]:-} $(compgen -f -- "${cur}") )
@ -492,7 +492,7 @@ _adb_util_complete_local_file()
}
if [[ $(type -t compopt) = "builtin" ]]; then
if [[ $(check_type compopt) == "builtin" ]]; then
complete -F _adb adb
else
complete -o nospace -F _adb adb

8
fastboot/fastboot.bash
View file

@ -16,11 +16,11 @@
#
_fastboot() {
if ! type -t "$1" >/dev/null; then
if ! check_type "$1" >/dev/null; then
return
fi
if type -t _init_completion >/dev/null; then
if check_type _init_completion >/dev/null; then
_init_completion || return
fi
@ -135,7 +135,7 @@ _fastboot_util_complete_local_file() {
xspec=$2
# Since we're probably doing file completion here, don't add a space after.
if [[ $(type -t compopt) = "builtin" ]]; then
if [[ $(check_type compopt) == "builtin" ]]; then
compopt -o plusdirs
if [[ "${xspec}" == "" ]]; then
COMPREPLY=( ${COMPREPLY[@]:-} $(compgen -f -- "${cur}") )
@ -175,7 +175,7 @@ _fastboot_util_complete_local_file() {
fi
}
if [[ $(type -t compopt) = "builtin" ]]; then
if [[ $(check_type compopt) == "builtin" ]]; then
complete -F _fastboot fastboot
else
complete -o nospace -F _fastboot fastboot