summaryrefslogtreecommitdiff
path: root/Master/tlpkg/TeXLive/TLMedia.pm
diff options
context:
space:
mode:
Diffstat (limited to 'Master/tlpkg/TeXLive/TLMedia.pm')
-rw-r--r--Master/tlpkg/TeXLive/TLMedia.pm14
1 files changed, 7 insertions, 7 deletions
diff --git a/Master/tlpkg/TeXLive/TLMedia.pm b/Master/tlpkg/TeXLive/TLMedia.pm
index 71be3ea3dee..03fb7301bed 100644
--- a/Master/tlpkg/TeXLive/TLMedia.pm
+++ b/Master/tlpkg/TeXLive/TLMedia.pm
@@ -30,7 +30,7 @@ sub new
} else {
if (-d "$location/texmf/web2c") {
$media = 'DVD';
- } elsif (-d "$location/$DiskArchive") {
+ } elsif (-d "$location/$Archive") {
$media = 'CD';
} else {
# we cannot find the right type, return undefined, that should
@@ -143,17 +143,17 @@ sub install_package {
if ($media eq 'DVD') {
$container = \@installfiles;
} elsif ($media eq 'CD') {
- if (-r "$location/$DiskArchive/$pkg.zip") {
- $container = "$location/$DiskArchive/$pkg.zip";
- } elsif (-r "$location/$DiskArchive/$pkg.tar.lzma") {
- $container = "$location/$DiskArchive/$pkg.tar.lzma";
+ if (-r "$location/$Archive/$pkg.zip") {
+ $container = "$location/$Archive/$pkg.zip";
+ } elsif (-r "$location/$Archive/$pkg.tar.lzma") {
+ $container = "$location/$Archive/$pkg.tar.lzma";
} else {
# for now only warn and return, should (?) be die!?
- tlwarn("Cannot find a package $pkg (.zip or .lzma) in $location/$DiskArchive\n");
+ tlwarn("Cannot find a package $pkg (.zip or .lzma) in $location/$Archive\n");
next;
}
} elsif (&media eq 'NET') {
- $container = "$location/$NetArchive/$pkg.$DefaultContainerExtension";
+ $container = "$location/$Archive/$pkg.$DefaultContainerExtension";
}
$self->_install_package($container,\@installfiles,$totlpdb);
# if we are installing from CD or NET we have to fetch the respective