summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2007-12-02 13:36:43 +0000
committerNorbert Preining <preining@logic.at>2007-12-02 13:36:43 +0000
commita9f4f617ec78be5592273a2106e7b884bf590ee1 (patch)
tree0d418ac199c53b26b10ed61790c978e4097e722a
parent608252e7184abec9f2fa858f9b48a9648cf08ce6 (diff)
$::diskdir and $::netdir support in TLUtils
git-svn-id: svn://tug.org/texlive/trunk@5674 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/tlpkg/TeXLive/TLUtils.pm12
1 files changed, 6 insertions, 6 deletions
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index 82a4faf76fc..fda5610b8be 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -501,9 +501,9 @@ sub install_package {
copy "$file", "$target/$dn";
}
} elsif (&media eq 'CD') {
- my $package="$::installerdir/archive/$what[0]";
- open IN, "$package", or warn "Can't open '$infile': $!\n";
- #or die "Can't open '$infile': $!\n";
+ my $package="$::installerdir/$::diskarchive/$what[0]";
+ open IN, "$package", or warn "Can't open '$package': $!\n"
+ or die "Can't open '$package': $!\n";
binmode IN;
open OUT, "|$lzmadec|$tar $target";
@@ -522,7 +522,7 @@ sub install_package {
close OUT;
close IN;
} elsif (&media eq 'NET') {
- my $package="$::texlive_url/archive/$what[0]";
+ my $package="$::texlive_url/$::netarchive/$what[0]";
system "$wget $package|$lzmadec|$tar $target";
} else {
die "This can't happen.";
@@ -548,7 +548,7 @@ CD/DVD.
sub media {
unless (defined $::_media_) {
- if (-d "$::installerdir/archive") {
+ if (-d "$::installerdir/$::diskarchive") {
$::_media_='CD';
} elsif (-d "$::installerdir/texmf/web2c") {
$::_media_='DVD';
@@ -591,7 +591,7 @@ sub architectures_available {
my @dir;
my @platforms;
if (&media eq "CD") {
- opendir DIR, "$::installerdir/archive";
+ opendir DIR, "$::installerdir/$::diskarchive";
@dir=readdir DIR;
chomp @dir;
for (@dir) {