[arch-commits] Commit in android-tools/trunk (PKGBUILD bash_completion.fastboot)
Anatol Pomozov
anatolik at archlinux.org
Sun Mar 28 21:29:14 UTC 2021
Date: Sunday, March 28, 2021 @ 21:29:14
Author: anatolik
Revision: 907950
upgpkg: android-tools 31.0.0-1
Modified:
android-tools/trunk/PKGBUILD
Deleted:
android-tools/trunk/bash_completion.fastboot
--------------------------+
PKGBUILD | 14 ++-----
bash_completion.fastboot | 90 ---------------------------------------------
2 files changed, 5 insertions(+), 99 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-03-28 21:28:49 UTC (rev 907949)
+++ PKGBUILD 2021-03-28 21:29:14 UTC (rev 907950)
@@ -3,9 +3,9 @@
# Contributor: Alucryd <alucryd at gmail dot com>
pkgname=android-tools
-pkgver=30.0.5
-_tag=${pkgver}p1 # https://github.com/nmeum/android-tools carries extra patch version on top of the upstream versioning
-pkgrel=3
+pkgver=31.0.0
+_tag=${pkgver} # https://github.com/nmeum/android-tools sometimes carries extra patch version on top of the upstream versioning
+pkgrel=1
pkgdesc='Android platform tools'
arch=(x86_64)
url='http://tools.android.com/'
@@ -12,11 +12,8 @@
license=(Apache MIT)
depends=(libusb protobuf brotli zstd)
makedepends=(pcre2 gtest cmake go ninja)
-source=(https://github.com/nmeum/android-tools/releases/download/$_tag/android-tools-$_tag.tar.xz
- bash_completion.fastboot)
- # Bash completion file was taken from https://github.com/mbrubeck/android-completion
-sha256sums=('8400387db0ff3c7d030418b9f63ea171917c26e6bcc82d9dc666c8c4c02e9806'
- '0807281422825404a7bee2a76f89062a104777011530f7c5e559910b8e585b0a')
+source=(https://github.com/nmeum/android-tools/releases/download/$_tag/android-tools-$_tag.tar.xz)
+sha256sums=('0b8f16370072d03e9f26de17ecba7dd44771cb042a23e86869108d57eb22f20d')
build() {
cd android-tools-$_tag
@@ -33,5 +30,4 @@
cd android-tools-$_tag
DESTDIR="${pkgdir}" ninja -C build install
- install -Dm 644 ../bash_completion.fastboot "$pkgdir"/usr/share/bash-completion/completions/fastboot
}
Deleted: bash_completion.fastboot
===================================================================
--- bash_completion.fastboot 2021-03-28 21:28:49 UTC (rev 907949)
+++ bash_completion.fastboot 2021-03-28 21:29:14 UTC (rev 907950)
@@ -1,90 +0,0 @@
-## Bash completion for the Android SDK tools.
-##
-## Copyright (c) 2009 Matt Brubeck
-##
-## Permission is hereby granted, free of charge, to any person obtaining a copy
-## of this software and associated documentation files (the "Software"), to deal
-## in the Software without restriction, including without limitation the rights
-## to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-## copies of the Software, and to permit persons to whom the Software is
-## furnished to do so, subject to the following conditions:
-##
-## The above copyright notice and this permission notice shall be included in
-## all copies or substantial portions of the Software.
-##
-## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-## IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-## AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-## THE SOFTWARE.
-
-
-function _fastboot()
-{
- local cur prev opts cmds c subcommand device_selected
- COMPREPLY=()
- cur="${COMP_WORDS[COMP_CWORD]}"
- prev="${COMP_WORDS[COMP_CWORD-1]}"
- opts="-w -s -p -c -i -b -n"
- cmds="update flashall flash erase getvar boot devices \
- reboot reboot-bootloader oem continue"
- subcommand=""
- partition_list="boot recovery system userdata bootloader radio"
- device_selected=""
-
- # Look for the subcommand.
- c=1
- while [ $c -lt $COMP_CWORD ]; do
- word="${COMP_WORDS[c]}"
- if [ "$word" = "-s" ]; then
- device_selected=true
- fi
- for cmd in $cmds; do
- if [ "$cmd" = "$word" ]; then
- subcommand="$word"
- fi
- done
- c=$((++c))
- done
-
- case "${subcommand}" in
- '')
- case "${prev}" in
- -s)
- # Use 'fastboot devices' to list serial numbers.
- COMPREPLY=( $(compgen -W "$(fastboot devices|cut -f1)" -- ${cur} ) )
- return 0
- ;;
- esac
- case "${cur}" in
- -*)
- COMPREPLY=( $(compgen -W "$opts" -- ${cur}) )
- return 0
- ;;
- esac
- if [ -z "$device_selected" ]; then
- local num_devices=$(( $(fastboot devices 2>/dev/null|wc -l) ))
- if [ "$num_devices" -gt "1" ]; then
- # With multiple devices, you must choose a device first.
- COMPREPLY=( $(compgen -W "-s" -- ${cur}) )
- return 0
- fi
- fi
- COMPREPLY=( $(compgen -W "${cmds}" -- ${cur}) )
- return 0
- ;;
- flash)
- # partition name
- COMPREPLY=( $(compgen -W "${partition_list}" -- ${cur}) )
- return 0
- ;;
- erase)
- # partition name
- COMPREPLY=( $(compgen -W "${partition_list}" -- ${cur}) )
- return 0
- ;;
- esac
-}
-complete -o default -F _fastboot fastboot
More information about the arch-commits
mailing list