summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xMaster/texmf/scripts/texlive/tlmgr.pl23
1 files changed, 10 insertions, 13 deletions
diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl
index 19021ed0ee8..f593a3dd283 100755
--- a/Master/texmf/scripts/texlive/tlmgr.pl
+++ b/Master/texmf/scripts/texlive/tlmgr.pl
@@ -2333,6 +2333,8 @@ sub action_option {
# ARCH
#
sub action_arch {
+ my @extra_w32_packs = qw/tlperl.win32 tlgs.win32 tlpsv.win32
+ collection-wintools/;
if ($^O=~/^MSWin(32|64)$/i) {
warn("action `arch' not supported on Windows\n");
}
@@ -2395,12 +2397,10 @@ sub action_arch {
}
if (TeXLive::TLUtils::member('win32', @todoarchs)) {
# install the necessary w32 stuff
- info("install: tlperl.win32\n");
- $tlmediasrc->install_package("tlperl.win32", $localtlpdb) if (!$opts{"dry-run"});
- info("install: tlgs.win32\n");
- $tlmediasrc->install_package("tlgs.win32", $localtlpdb) if (!$opts{"dry-run"});
- info("install: tlpsv.win32\n");
- $tlmediasrc->install_package("tlpsv.win32", $localtlpdb) if (!$opts{"dry-run"});
+ for my $p (@extra_w32_packs) {
+ info("install: $p\n");
+ $tlmediasrc->install_package($p, $localtlpdb) if (!$opts{"dry-run"});
+ }
}
# update the option("available_architectures") list of installed archs
if (!$opts{"dry-run"}) {
@@ -2445,13 +2445,10 @@ sub action_arch {
}
}
if (TeXLive::TLUtils::member('win32', @todoarchs)) {
- # remove the additionally installed w32 stuff
- info("remove: tlperl.win32\n");
- $localtlmedia->remove_package("tlperl.win32") if (!$opts{"dry-run"});
- info("remove: tlgs.win32\n");
- $localtlmedia->remove_package("tlgs.win32") if (!$opts{"dry-run"});
- info("remove: tlpsv.win32\n");
- $localtlmedia->remove_package("tlpsv.win32") if (!$opts{"dry-run"});
+ for my $p (@extra_w32_packs) {
+ info("remove: $p\n");
+ $localtlmedia->remove_package($p) if (!$opts{"dry-run"});
+ }
}
if (!$opts{"dry-run"}) {
# update the option("available_architectures") list of installed archs