File fix-install-completion.patch of Package android-tools

Overview Repositories Revisions Requests Users Attributes Meta

File fix-install-completion.patch of Package android-tools (Revision 07a16c4a72bab63c31262f69eed616b6)

Currently displaying revision 07a16c4a72bab63c31262f69eed616b6 , Show latest

diff -ruN a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,8 +11,7 @@
 option(ANDROID_TOOLS_PATCH_VENDOR "Patch vendor projects using patches directory" ON)
 
 # Install bash/zsh completion files.
-set(COMPLETION_COMMON_DIR "${CMAKE_INSTALL_FULL_DATADIR}/android-tools/completions")
-add_subdirectory(completions)
+set(COMPLETION_COMMON_DIR "${CMAKE_INSTALL_FULL_DATADIR}/bash-completion/completions")
 
 # Android provides it's own version of mke2fs which is incompatible with
 # the version shipped by e2fsprogs. To prevent a name clash we install
diff -ruN a/vendor/adb/adb.bash b/vendor/adb/adb.bash
--- a/vendor/adb/adb.bash
+++ b/vendor/adb/adb.bash
@@ -16,11 +16,11 @@
 #
 
 _adb() {
-    if ! check_type "$1" >/dev/null; then
+    if ! type -t "$1" >/dev/null; then
         return
     fi
 
-    if check_type _init_completion >/dev/null; then
+    if type -t _init_completion >/dev/null; then
         _init_completion || return
     fi
 
@@ -435,7 +435,7 @@
     fi
 
     # Since we're probably doing file completion here, don't add a space after.
-    if [[ $(check_type compopt) == "builtin" ]]; then
+    if [[ $(type -t compopt) == "builtin" ]]; then
         compopt -o nospace
     fi
 
@@ -451,7 +451,7 @@
     xspec=$2
 
     # Since we're probably doing file completion here, don't add a space after.
-    if [[ $(check_type compopt) == "builtin" ]]; then
+    if [[ $(type -t compopt) == "builtin" ]]; then
         compopt -o plusdirs
         if [[ "${xspec}" == "" ]]; then
             COMPREPLY=( ${COMPREPLY[@]:-} $(compgen -f -- "${cur}") )
@@ -492,7 +492,7 @@
 }
 
 
-if [[ $(check_type compopt) == "builtin" ]]; then
+if [[ $(type -t compopt) == "builtin" ]]; then
     complete -F _adb adb
 else
     complete -o nospace -F _adb adb
diff -ruN a/vendor/core/fastboot/fastboot.bash b/vendor/core/fastboot/fastboot.bash
--- a/vendor/core/fastboot/fastboot.bash
+++ b/vendor/core/fastboot/fastboot.bash
@@ -16,11 +16,11 @@
 #
 
 _fastboot() {
-    if ! check_type "$1" >/dev/null; then
+    if ! type -t "$1" >/dev/null; then
         return
     fi
 
-    if check_type _init_completion >/dev/null; then
+    if type -t _init_completion >/dev/null; then
         _init_completion || return
     fi
 
@@ -135,7 +135,7 @@
     xspec=$2
 
     # Since we're probably doing file completion here, don't add a space after.
-    if [[ $(check_type compopt) == "builtin" ]]; then
+    if [[ $(type -t compopt) == "builtin" ]]; then
         compopt -o plusdirs
         if [[ "${xspec}" == "" ]]; then
             COMPREPLY=( ${COMPREPLY[@]:-} $(compgen -f -- "${cur}") )
@@ -175,7 +175,7 @@
     fi
 }
 
-if [[ $(check_type compopt) == "builtin" ]]; then
+if [[ $(type -t compopt) == "builtin" ]]; then
     complete -F _fastboot fastboot
 else
     complete -o nospace -F _fastboot fastboot

Places

File fix-install-completion.patch of Package android-tools (Revision 07a16c4a72bab63c31262f69eed616b6)

Places