summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2007-12-02 12:56:56 +0000
committerNorbert Preining <preining@logic.at>2007-12-02 12:56:56 +0000
commitc3fd41c9cc8d7c6d91a4203b1b4ef7cc301e87cc (patch)
treed8709f19510d913eef4d9edab23ae171c77ae70d
parentdeed5dbfd05db940d017abfee402f7a813b4a2b8 (diff)
add updmap-hdr.cfg support
git-svn-id: svn://tug.org/texlive/trunk@5671 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/install-tl.pl14
1 files changed, 10 insertions, 4 deletions
diff --git a/Master/install-tl.pl b/Master/install-tl.pl
index b1614a8a6af..dbb40f0e5f1 100755
--- a/Master/install-tl.pl
+++ b/Master/install-tl.pl
@@ -42,7 +42,7 @@ my $profilepath = './texlive.profile';
# needs our since for menu ...
our $trynet=0;
# the url of net location, can be changed with -url ....
-my $texlive_url = 'http://tug.org/svn/texlive/trunk/Master';
+$::texlive_url = 'http://tug.org/svn/texlive/trunk/Master';
# the default scheme to be installed
my $default_scheme='scheme-full';
# some arrays where the lists of collections to be installed are saved
@@ -102,9 +102,9 @@ if ("$opt_profile" ne "") {
}
if ("$opt_url" ne "") {
- $texlive_url = "$opt_url";
+ $::texlive_url = "$opt_url";
}
-$::texlive_db_url="$texlive_url/$TeXLive::TLConfig::InfraLocation";
+$::texlive_db_url="$::texlive_url/$TeXLive::TLConfig::InfraLocation";
# the TLPDB instances we will use. $tlpdb is for the one from the installation
# media, while $localtlpdb is for the new installation
@@ -368,7 +368,7 @@ sub calc_depends {
sub load_tlpdb {
my $database;
if (media eq 'NET') {
- $database="$texlive_url/$TeXLive::TLConfig::InfraLocation/texlive.tlpdb";
+ $database="$::texlive_url/$TeXLive::TLConfig::InfraLocation/texlive.tlpdb";
} else {
$database="$::installerdir/$TeXLive::TLConfig::InfraLocation/texlive.tlpdb";
}
@@ -517,7 +517,9 @@ sub do_install_packages {
my $a = $1;
if (($vars{$k}) && ($package =~ m/\.$a$/)) {
# ok this is a binary we should install from the net
+ $::_media_ = 'NET';
install_package("$package.$TeXLive::TLConfig::DefaultContainerExtension");
+ $::_media_ = 'CD';
$donefromnet = 1;
last;
}
@@ -562,7 +564,11 @@ sub parse_executes_and_create_files {
#
# updmap.cfg -> TEXMFSYSVAR/web2c
my $updmapcfgpath = "$vars{'TEXMFSYSVAR'}/web2c/updmap.cfg";
+ open(UPDHDR,"<$vars{'TEXDIR'}/texmf/web2c/updmap-hdr.cfg")
+ or die("Cannot find $vars{'TEXDIR'}/texmf/web2c/updmap-hdr.cfg!\n");
open(UPDMAPCFG,">$updmapcfgpath") or die("Cannot open $updmapcfgpath for writing!\n");
+ foreach (<UPDHDR>) { print UPDMAPCFG ; }
+ close(UPDHDR);
foreach (sort keys %maps) {
print UPDMAPCFG "Mixed" if ($maps{$_} == 2);
print UPDMAPCFG "Map $_\n";