summaryrefslogtreecommitdiff
path: root/Master/tlpkg/TeXLive/TLMedia.pm
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2008-07-08 13:01:20 +0000
committerNorbert Preining <preining@logic.at>2008-07-08 13:01:20 +0000
commitaa119be73d73727e173789d45ee2a40bfe0e62c6 (patch)
treea470469e15442848b63bf162d3afb80305fbf69c /Master/tlpkg/TeXLive/TLMedia.pm
parent556c8fb15a545d032fe1bb0054304c96ae6ec282 (diff)
install-tl (and tlmgr and and):
- use -location as installation source selection tool - remove -media - remove various functions from TLUtils.pm . remove NetArchive/DiskArchive distinction, only TLUtils::Archive remains and that is "archive" git-svn-id: svn://tug.org/texlive/trunk@9361 c570f23f-e606-0410-a88d-b1316a301751
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