summaryrefslogtreecommitdiff
path: root/Master/install-tl.pl
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2007-12-02 13:17:12 +0000
committerNorbert Preining <preining@logic.at>2007-12-02 13:17:12 +0000
commit608252e7184abec9f2fa858f9b48a9648cf08ce6 (patch)
tree340098b1b1874d86c5eca79d95a2bafda10e2b79 /Master/install-tl.pl
parent605a5095e43cd3e3a4e2e675550a1b18154a1fd1 (diff)
add support for fmtutil-hdr.cnf
git-svn-id: svn://tug.org/texlive/trunk@5673 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/install-tl.pl')
-rwxr-xr-xMaster/install-tl.pl29
1 files changed, 19 insertions, 10 deletions
diff --git a/Master/install-tl.pl b/Master/install-tl.pl
index dbb40f0e5f1..965e32249c5 100755
--- a/Master/install-tl.pl
+++ b/Master/install-tl.pl
@@ -78,9 +78,13 @@ our %vars=( # 'n_' means 'number of'.
my $opt_media = "";
my $opt_url = "";
my $opt_profile = "";
+$::netarchive = "archive";
+$::diskarchive = "archive";
GetOptions("media=s" => \$opt_media,
"profile=s"=> \$opt_profile,
+ "netarchive=s" => \$::netarchive,
+ "diskarchive=s" => \$::diskarchive,
"url=s" => \$opt_url ) or die("No pod doc till now!");
if ("$opt_media" eq "CD") {
@@ -504,9 +508,9 @@ sub do_install_packages {
install_package(@allfiles);
} elsif (&media eq 'CD') {
my $container = "$package";
- if (-r "$::installerdir/archive/$package.zip") {
+ if (-r "$::installerdir/$::diskarchive/$package.zip") {
$container = "$package.zip";
- } elsif (-r "$::installerdir/archive/$package.tar.lzma") {
+ } elsif (-r "$::installerdir/$::diskarchive/$package.tar.lzma") {
$container = "$package.tar.lzma";
} else {
# ok, it could be a binary package which should be installed from
@@ -527,7 +531,7 @@ sub do_install_packages {
}
if (!$donefromnet) {
# for now only warn and return, should (?) be die!?
- warn "Cannot find a package $package (.zip or .lzma) in $::installerdir/archive\n";
+ warn "Cannot find a package $package (.zip or .lzma) in $::installerdir/$::diskarchive\n";
}
next;
}
@@ -577,10 +581,15 @@ sub parse_executes_and_create_files {
#
# fmtutil.cnf -> TEXMFSYSVAR/web2c
my @formatlines;
+ open(INFILE,"<$vars{'TEXDIR'}/texmf/fmtutil/fmtutil-hdr.cnf")
+ or die("Cannot open $vars{'TEXDIR'}/texmf/fmtutil/fmtutil-hdr.cnf\n");
+ my @tmp = <INFILE>;
+ close (INFILE);
+ push @formatlines, @tmp;
foreach my $f (keys %fmtcnffiles) {
- open(INFILE,"<$::installerdir/texmf/fmtutil/format.$f.cnf")
- or die("Cannot open $::installerdir/texmf/fmtutil/format.$f.cnf");
- my @tmp = <INFILE>;
+ open(INFILE,"<$vars{'TEXDIR'}/texmf/fmtutil/format.$f.cnf")
+ or die("Cannot open $vars{'TEXDIR'}/texmf/fmtutil/format.$f.cnf");
+ @tmp = <INFILE>;
close(INFILE);
push @formatlines, @tmp;
}
@@ -595,15 +604,15 @@ sub parse_executes_and_create_files {
# hyphenation patterns
my @languagelines = ();
# we first have to add language.us
- open(INFILE,"<$::installerdir/texmf/tex/generic/config/language.us")
- or die("Cannot open $::installerdir/texmf/tex/generic/config/language.us");
+ open(INFILE,"<$vars{'TEXDIR'}/texmf/tex/generic/config/language.us")
+ or die("Cannot open $vars{'TEXDIR'}/texmf/tex/generic/config/language.us");
my @tmp = <INFILE>;
close(INFILE);
push @languagelines, @tmp;
# now do the other languages
foreach my $f (keys %hypcnffiles) {
- open(INFILE,"<$::installerdir/texmf/tex/generic/config/language.$f.dat")
- or die("Cannot open $::installerdir/texmf/tex/generic/config/language.$f.dat");
+ open(INFILE,"<$vars{'TEXDIR'}/texmf/tex/generic/config/language.$f.dat")
+ or die("Cannot open $vars{'TEXDIR'}/texmf/tex/generic/config/language.$f.dat");
my @tmp = <INFILE>;
close(INFILE);
push @languagelines, @tmp;