texlive[47987] Master/tlpkg/TeXLive/TLUtils.pm: more fixes for code

[commits+preining at tug.org]

Revision: 47987
          http://tug.org/svn/texlive?view=revision&revision=47987
Author:   preining
Date:     2018-06-11 08:39:31 +0200 (Mon, 11 Jun 2018)
Log Message:
-----------
more fixes for code cleanup

Modified Paths:
--------------
    trunk/Master/tlpkg/TeXLive/TLUtils.pm

Modified: trunk/Master/tlpkg/TeXLive/TLUtils.pm
===================================================================
--- trunk/Master/tlpkg/TeXLive/TLUtils.pm	2018-06-11 06:39:21 UTC (rev 47986)
+++ trunk/Master/tlpkg/TeXLive/TLUtils.pm	2018-06-11 06:39:31 UTC (rev 47987)
@@ -2169,21 +2169,22 @@
     return (0, "nothing to unpack");
   }
 
-  my $decompressor;
+  my $decompressorType;
   my $compressorextension;
   if ($what =~ m/\.tar\.$CompressorExtRegexp$/) {
     $compressorextension = $1;
-    $decompressor = $1 eq "gz" ? "gzip" : $1;
+    $decompressorType = $1 eq "gz" ? "gzip" : $1;
   }
-  if (!$decompressor) {
+  if (!$decompressorType) {
     return(0, "don't know how to unpack");
   }
   # make sure that the found uncompressor type is also available
-  if (!member($decompressor, @{$::progs{'working_compressors'}})) {
-    return(0, "unsupported container format $decompressor");
+  if (!member($decompressorType, @{$::progs{'working_compressors'}})) {
+    return(0, "unsupported container format $decompressorType");
   }
 
   # only check the necessary compressor program
+  my $decompressor = $::progs{$decompressorType};
   my @decompressorArgs = @{$Compressors{$decompressor}{'decompress_args'}};
 
   my $fn = basename($what);