summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2018-05-23 02:33:23 +0000
committerNorbert Preining <preining@logic.at>2018-05-23 02:33:23 +0000
commit133247fba2e655af3d1907ca806032a129d95fdf (patch)
tree240108cf1133c6e1c7354b3a31e23fb9781f116b /Master/texmf-dist
parent17966dc786dc997f3e2f15a579ae6b2478d57442 (diff)
partially working version with full compressor/downloader support
git-svn-id: svn://tug.org/texlive/trunk@47807 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rwxr-xr-xMaster/texmf-dist/scripts/texlive/tlmgr.pl11
1 files changed, 5 insertions, 6 deletions
diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl
index e89a3ab30d9..906faff441f 100755
--- a/Master/texmf-dist/scripts/texlive/tlmgr.pl
+++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl
@@ -1091,8 +1091,7 @@ sub backup_and_remove_package {
return($F_WARNING);
}
if ($opts{"backup"}) {
- my ($compressor, $compressorextension) = TeXLive::TLUtils::setup_compressor();
- $tlp->make_container($compressor, $localtlpdb->root,
+ $tlp->make_container($::progs{'compressor'}, $localtlpdb->root,
$opts{"backupdir"},
"${pkg}.r" . $tlp->revision,
$tlp->relocated);
@@ -2142,12 +2141,12 @@ sub action_backup {
clear_old_backups ($pkg, $opts{"backupdir"}, $opts{"clean"}, $opts{"dry-run"}, 1);
} else {
# for now default to xz and allow overriding with env var
- my ($compressor, $compressorextension) = TeXLive::TLUtils::setup_compressor();
+ my $compressorextension = $CompressorExtension{$::progs{'compressor'}};
my $tlp = $localtlpdb->get_package($pkg);
info("saving current status of $pkg to $opts{'backupdir'}/${pkg}.r" .
$tlp->revision . ".tar.$compressorextension\n");
if (!$opts{"dry-run"}) {
- $tlp->make_container($compressor, $localtlpdb->root,
+ $tlp->make_container($::progs{'compressor'}, $localtlpdb->root,
$opts{"backupdir"}, "${pkg}.r" . $tlp->revision);
}
}
@@ -3182,8 +3181,8 @@ sub action_update {
}
if ($opts{"backup"} && !$opts{"dry-run"}) {
- my ($compressor, $compressorextension) = TeXLive::TLUtils::setup_compressor();
- $tlp->make_container($compressor, $root,
+ my $compressorextension = $CompressorExtension{$::progs{'compressor'}};
+ $tlp->make_container($::progs{'compressor'}, $root,
$opts{"backupdir"}, "${pkg}.r" . $tlp->revision,
$tlp->relocated);
$unwind_package =