diff options
Diffstat (limited to 'Master/install-tl.pl')
-rwxr-xr-x | Master/install-tl.pl | 69 |
1 files changed, 5 insertions, 64 deletions
diff --git a/Master/install-tl.pl b/Master/install-tl.pl index a6643eb7358..653affbb69a 100755 --- a/Master/install-tl.pl +++ b/Master/install-tl.pl @@ -24,7 +24,8 @@ BEGIN { use TeXLive::TLUtils qw(initialize_installer media platform platform_desc debug which getenv win32 unix program_exists architectures_available additional_architectures_available_from_net get_system_tmpdir member - mkdirhier make_var_skeleton make_local_skeleton install_package copy); + mkdirhier make_var_skeleton make_local_skeleton install_package copy + create_fmtutil create_updmap create_language); use TeXLive::TLPOBJ; use TeXLive::TLPDB; use TeXLive::TLConfig; @@ -169,9 +170,9 @@ if ($opt_profile eq "") { calc_depends(); prepare_installation(); do_install_packages(); -create_fmtutil(); -create_updmap(); -create_language(); +create_fmtutil($localtlpdb,$vars{'TEXMFSYSVAR'},$vars{'TEXMFLOCAL'}); +create_updmap($localtlpdb,$vars{'TEXMFSYSVAR'},$vars{'TEXMFLOCAL'}); +create_language($localtlpdb,$vars{'TEXMFSYSVAR'},$vars{'TEXMFLOCAL'}); do_postinst_stuff(); dump_vars('./vars'); # if we installed from a profile we don't need to write it out @@ -534,66 +535,6 @@ sub do_install_packages { $localtlpdb->save; } -sub create_fmtutil { - my @lines = $localtlpdb->fmtutil_cnf_lines; - if (-r "$vars{'TEXMFLOCAL'}/web2c/fmtutil-local.cnf") { - # - # this should be done more intelligently, but for now only add those - # lines without any duplication check ... - open FOO, "<$vars{'TEXMFLOCAL'}/web2c/fmtutil-local.cnf" - or die "strange -r but cannot open?\n"; - my @tmp = <FOO>; - push @lines, @tmp; - } - if ($#lines >= 0) { - my $fmtutilpath = "$vars{'TEXMFSYSVAR'}/web2c/fmtutil.cnf"; - open(OUTFILE,">$fmtutilpath") - or die("Cannot open $fmtutilpath for writing!\n"); - foreach (@lines) { print OUTFILE; } - close(OUTFILE); - } -} - -sub create_updmap { - my @lines = $localtlpdb->updmap_cfg_lines; - if (-r "$vars{'TEXMFLOCAL'}/web2c/updmap-local.cfg") { - # - # this should be done more intelligently, but for now only add those - # lines without any duplication check ... - open FOO, "<$vars{'TEXMFLOCAL'}/web2c/updmap-local.cfg" - or die "strange -r but cannot open?\n"; - my @tmp = <FOO>; - push @lines, @tmp; - } - if ($#lines >= 0) { - my $updmapcfgpath = "$vars{'TEXMFSYSVAR'}/web2c/updmap.cfg"; - open(OUTFILE,">$updmapcfgpath") - or die("Cannot open $updmapcfgpath for writing!\n"); - foreach (@lines) { print OUTFILE; } - close(OUTFILE); - } -} - -sub create_language { - my @lines = $localtlpdb->language_dat_lines; - if (-r "$vars{'TEXMFLOCAL'}/tex/generic/config/language-local.dat") { - # - # this should be done more intelligently, but for now only add those - # lines without any duplication check ... - open FOO, "<$vars{'TEXMFLOCAL'}/tex/generic/config/language-local.dat" - or die "strange -r but cannot open?\n"; - my @tmp = <FOO>; - push @lines, @tmp; - } - if ($#lines >= 0) { - my $lanpath = "$vars{'TEXMFSYSVAR'}/tex/generic/config/language.dat"; - open(OUTFILE,">$lanpath") - or die("Cannot open $lanpath for writing!\n"); - foreach (@lines) { print OUTFILE; } - close(OUTFILE); - } -} - # do_postinst_stuff has to fix up the texmf tree and install some missing # files. The things to do are taken from the install-live.sh installer # of former times, and should be critically checked. |