From 2755d2b241077f5a3f68db128c699d00c91d8452 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 19 Oct 2015 10:08:16 +0200 Subject: [PATCH] xorg: adjust generator to work with other archive types In the end I didn't utilize it, but it shouldn't hurt. --- pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 1e0ce6d6167..6665a3bc00a 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -61,7 +61,7 @@ while (<>) { #next unless $pkg eq "xcbutil"; } - $tarball =~ /\/([^\/]*)\.tar\.bz2$/; + $tarball =~ /\/([^\/]*)\.tar\.(bz2|gz|xz)$/; my $pkgName = $1; print " $pkg $pkgName\n"; @@ -82,7 +82,7 @@ while (<>) { print "\nunpacking $path\n"; system "rm -rf '$tmpDir'"; mkdir $tmpDir, 0700; - system "cd '$tmpDir' && tar xfj '$path'"; + system "cd '$tmpDir' && tar xf '$path'"; die "cannot unpack `$path'" if $? != 0; print "\n";