diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Completion/Unix/Command/_tar | 2 | ||||
| -rw-r--r-- | Completion/Unix/Type/_tar_archive | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index d371f7786..3e4c30bf2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,11 @@ 2018-04-05 Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp> + * 42585 (cf. 42574: Eitan Adler): Completion/Unix/Command/_tar, + Completion/Unix/Type/_tar_archive: complete all compressed + archives when libarchive-based tar is being used without + compression flag + * 42577: Completion/Unix/Command/_strings: fix macOS support * 42578: Completion/Unix/Command/_shutdown: add support for macOS diff --git a/Completion/Unix/Command/_tar b/Completion/Unix/Command/_tar index cff50562e..3e44b98f7 100644 --- a/Completion/Unix/Command/_tar +++ b/Completion/Unix/Command/_tar @@ -21,7 +21,7 @@ local _tar_cmd tf tmp tmpb del index # from some of the possible long options, and from the second word if # that does not start with a hyphen. -if _pick_variant gnu=GNU unix --version; then +if _pick_variant gnu=GNU libarchive=libarchive unix --version; then case "$($service --version)" in ("tar (GNU tar) "(#b)([0-9.-]##)*) autoload -z is-at-least diff --git a/Completion/Unix/Type/_tar_archive b/Completion/Unix/Type/_tar_archive index 28df77638..e8ddb1e59 100644 --- a/Completion/Unix/Type/_tar_archive +++ b/Completion/Unix/Type/_tar_archive @@ -20,7 +20,7 @@ if [[ "$1" = *[urtx]* ]]; then _files "$expl[@]" -g '*.(tar|TAR).bz2(-.)' elif [[ "$1" = *J* ]]; then _files "$expl[@]" -g '*.(tar|TAR).(lzma|xz)(-.)' - elif [[ "$_cmd_variant[$service]" == gnu ]]; then + elif [[ "$_cmd_variant[$service]" == (gnu|libarchive) ]]; then _files "$expl[@]" -g '*.((tar|TAR)(.gz|.GZ|.Z|.bz2|.lzma|.xz|)|(tbz|tgz|txz))(-.)' else _files "$expl[@]" -g '*.(tar|TAR)(-.)' |