586ca16902d9dae4d95d5256a824572f60219c83

Author
Ing. Jan Kaláb <jan+github@kalabovi.org>
Committer
Marc Cornellà <marc.cornella@live.com>
Date

Message

extract: add AAR Android archive support (#7511)

Diff

 1diff --git a/plugins/extract/README.md b/plugins/extract/README.md
 2index c6bdd36dd6c3cd2d6920103ca709dab17e47d340..83b878c3201ccf090df97a8eacd96394e5e8c946 100644
 3--- a/plugins/extract/README.md
 4+++ b/plugins/extract/README.md
 5@@ -19,6 +19,7 @@ plugins=(... extract)
 6 | `7z`              | 7zip file                            |
 7 | `Z`               | Z archive (LZW)                      |
 8 | `apk`             | Android app file                     |
 9+| `aar`             | Android library file                 |
10 | `bz2`             | Bzip2 file                           |
11 | `deb`             | Debian package                       |
12 | `gz`              | Gzip file                            |
13diff --git a/plugins/extract/_extract b/plugins/extract/_extract
14index 3baefa33951604bc133938b9f114f08d93493327..33d49fcc5ecc2fa3b1ed3d2a4118efee9899c3e8 100644
15--- a/plugins/extract/_extract
16+++ b/plugins/extract/_extract
17@@ -3,5 +3,5 @@
18 
19 _arguments \
20   '(-r --remove)'{-r,--remove}'[Remove archive.]' \
21-  "*::archive file:_files -g '(#i)*.(7z|Z|apk|bz2|deb|gz|ipsw|jar|lzma|rar|sublime-package|tar|tar.bz2|tar.gz|tar.xz|tar.zma|tbz|tbz2|tgz|tlz|txz|war|whl|xpi|xz|zip)(-.)'" \
22+  "*::archive file:_files -g '(#i)*.(7z|Z|apk|aar|bz2|deb|gz|ipsw|jar|lzma|rar|sublime-package|tar|tar.bz2|tar.gz|tar.xz|tar.zma|tbz|tbz2|tgz|tlz|txz|war|whl|xpi|xz|zip)(-.)'" \
23     && return 0
24diff --git a/plugins/extract/extract.plugin.zsh b/plugins/extract/extract.plugin.zsh
25index 4c72ce8707a5c9fe65b00cbb77482005e129d30f..5e9b9ff2424cfc3aaeb0d8a23fe9699f36b327fe 100644
26--- a/plugins/extract/extract.plugin.zsh
27+++ b/plugins/extract/extract.plugin.zsh
28@@ -46,7 +46,7 @@ extract() {
29 			(*.xz) unxz "$1" ;;
30 			(*.lzma) unlzma "$1" ;;
31 			(*.z) uncompress "$1" ;;
32-			(*.zip|*.war|*.jar|*.sublime-package|*.ipsw|*.xpi|*.apk|*.whl) unzip "$1" -d $extract_dir ;;
33+			(*.zip|*.war|*.jar|*.sublime-package|*.ipsw|*.xpi|*.apk|*.aar|*.whl) unzip "$1" -d $extract_dir ;;
34 			(*.rar) unrar x -ad "$1" ;;
35 			(*.7z) 7za x "$1" ;;
36 			(*.deb)