zsh-workers
 help / color / mirror / code / Atom feed
From: Jun T <takimoto-j@kba.biglobe.ne.jp>
To: zsh-workers@zsh.org
Cc: Eitan Adler <lists@eitanadler.com>
Subject: Re: Teach 'tar' to support more file types
Date: Thu, 5 Apr 2018 12:55:21 +0900	[thread overview]
Message-ID: <7060C6C4-6721-4878-B8BC-224346633816@kba.biglobe.ne.jp> (raw)
In-Reply-To: <CAF6rxg=4Uj3_KdWLwy2vWNvEk6vBr+3YtGrAjvAwQOCUN_H_=Q@mail.gmail.com>


> 2018/04/02 7:10, Eitan Adler <lists@eitanadler.com> wrote:
> 
>    In libarchive based (BSD) tar implementations, all file types can be
>    uncompressed, even without a filetype letter.  In GNU tar's case
>    "recent" versions (for over 10 years) can do the same.
>    As such, remove the check for tar type and just assume it works.

We can't assume it works since there are many systems where tar requires
explicit compression flags. Even on some BSDs (OpenBSD and NetBSD) tar
is not based on libarchive.

If the tar command is based on libarchive, we can detect it by using
'tar --version'.


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)(-.)'




  reply	other threads:[~2018-04-05  3:56 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-01 22:10 Eitan Adler
2018-04-05  3:55 ` Jun T [this message]
2018-04-05  5:41   ` Baptiste Daroussin
2018-04-06  6:53   ` Eitan Adler

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7060C6C4-6721-4878-B8BC-224346633816@kba.biglobe.ne.jp \
    --to=takimoto-j@kba.biglobe.ne.jp \
    --cc=lists@eitanadler.com \
    --cc=zsh-workers@zsh.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/zsh/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).