From 68de942a3e3ab2d927389d502695e37a898d6ad0 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Mon, 11 Jun 2018 06:39:10 +0000 Subject: code cleanup and streamlining (use %Compressors) git-svn-id: svn://tug.org/texlive/trunk@47985 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/TeXLive/TLPOBJ.pm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'Master/tlpkg/TeXLive/TLPOBJ.pm') diff --git a/Master/tlpkg/TeXLive/TLPOBJ.pm b/Master/tlpkg/TeXLive/TLPOBJ.pm index 32160a2c811..43ccd889bd6 100644 --- a/Master/tlpkg/TeXLive/TLPOBJ.pm +++ b/Master/tlpkg/TeXLive/TLPOBJ.pm @@ -12,9 +12,7 @@ sub module_revision { return $_modulerevision; } use TeXLive::TLConfig qw($DefaultCategory $CategoriesRegexp $MetaCategoriesRegexp $InfraLocation - @AcceptedCompressors %CompressorArgs - %CompressorProgram %CompressorExtension - $DefaultCompressorFormat + %Compressors $DefaultCompressorFormat $RelocPrefix $RelocTree); use TeXLive::TLCrypto; use TeXLive::TLTREE; @@ -718,14 +716,14 @@ sub make_container { if ($type ne 'tar') { # compress it - my $compressor = $::progs{$CompressorProgram{$type}}; + my $compressor = $::progs{$type}; if (!defined($compressor)) { # fall back to $type as compressor, but that shouldn't happen tlwarn("$0: programs not set up, trying \"$type\".\n"); $compressor = $type; } - my @compressorargs = @{$CompressorArgs{$type}}; - my $compressorextension = $CompressorExtension{$type}; + my @compressorargs = @{$Compressors{$type}{'compress_args'}}; + my $compressorextension = $Compressors{$type}{'extension'}; $containername = "$tarname.$compressorextension"; debug("selected compressor: $compressor with @compressorargs, " . "on $destdir/$tarname\n"); -- cgit v1.2.3