Skip to content

Commit

Permalink
deb: support recognition and recompression of xz archives
Browse files Browse the repository at this point in the history
  • Loading branch information
jengelh authored and adrianschroeter committed Aug 17, 2015
1 parent 6c8ed29 commit 31e0e4c
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 3 deletions.
13 changes: 10 additions & 3 deletions debtransform
Expand Up @@ -281,10 +281,10 @@ if ($tags->{'DEBTRANSFORM-FILES-TAR'}) {
}

if (!$tarfile || !@debtarfiles) {
my @tars = grep {/\.tgz$|\.tar(?:\.gz|\.bz2)?$/} @dir;
my @debtars = grep {/^debian\.tar(?:\.gz|\.bz2)?$/} @tars;
my @tars = grep {/\.tgz$|\.tar(?:\.gz|\.bz2|\.xz)?$/} @dir;
my @debtars = grep {/^debian\.tar(?:\.gz|\.bz2|\.xz)?$/} @tars;
if (!$tarfile) {
@tars = grep {!/^debian\.tar(?:\.gz|\.bz2)?$/} @tars;
@tars = grep {!/^debian\.tar(?:\.gz|\.bz2|\.xz)?$/} @tars;
if (@debtarfiles) {
my %debtarfiles = map {$_ => 1} @debtarfiles;
@tars = grep {!$debtarfiles{$_}} @tars;
Expand Down Expand Up @@ -315,6 +315,13 @@ if ($tarfile =~ /\.tar\.bz2/) {
print "converting $dir/$old to $tarfile\n";
system( ( "debtransformbz2", "$dir/$old", "$tmptar" )) == 0 || die("cannot transform .tar.bz2 to .tar.gz");
}
if ($tarfile =~ /\.tar\.xz/) {
my $old = $tarfile;
$tarfile =~ s/\.tar\.xz/\.tar\.gz/;
$tmptar = "$out/$tarfile";
print "converting $dir/$old to $tarfile\n";
system( ( "debtransformxz", "$dir/$old", "$tmptar" )) == 0 || die("cannot transform .tar.xz to .tar.gz");
}
if ($tarfile =~ /\.zip/) {
my $old = $tarfile;
$tarfile =~ s/\.zip/\.tar\.gz/;
Expand Down
6 changes: 6 additions & 0 deletions debtransformxz
@@ -0,0 +1,6 @@
#!/bin/sh
if test $# -ne 2; then
exit 1
fi
xz -cd "$1" | gzip -f - >"$2" || exit 1
exit 0

0 comments on commit 31e0e4c

Please sign in to comment.