summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2018-06-11 15:30:31 +0900
committerNorbert Preining <norbert@preining.info>2018-06-11 15:30:31 +0900
commit00f83e02cec3a68cd3c36af1a12e601643d432fb (patch)
treef1d7fead7516f56b4643cb70b3e1f8da7cfad788
parent1e6e7673cc3111da10914abe00b403571cbbbff7 (diff)
more fixes for code cleanupmerged/system-pipe
-rw-r--r--Master/tlpkg/TeXLive/TLUtils.pm11
1 files changed, 6 insertions, 5 deletions
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index 5eca1e906df..cb81efe0bf2 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -2169,21 +2169,22 @@ sub unpack {
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);