From a81d5cc5602a99e035494e0160d81d081ae38209 Mon Sep 17 00:00:00 2001 From: Taco Hoekwater Date: Sat, 4 Jun 2011 12:13:34 +0000 Subject: Update the generation of texmfcnf.lua git-svn-id: svn://tug.org/texlive/trunk@22773 c570f23f-e606-0410-a88d-b1316a301751 --- Master/install-tl | 43 +++++++++++++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 12 deletions(-) (limited to 'Master') diff --git a/Master/install-tl b/Master/install-tl index 84004243552..0155b8c3108 100755 --- a/Master/install-tl +++ b/Master/install-tl @@ -938,7 +938,6 @@ sub do_texmf_cnf { my @changedtmf = (); # install to disk: write only changed items my $yyyy = $TeXLive::TLConfig::ReleaseYear; - my $rewritetmflua = 0; # need a new texmfcnf.lua? # we have to find TEXMFLOCAL TEXMFSYSVAR and TEXMFHOME foreach my $line (@texmfcnflines) { @@ -961,7 +960,6 @@ sub do_texmf_cnf { } elsif ($line =~ m/^TEXMFVAR/) { if ($vars{"TEXMFVAR"} ne "~/.texlive$yyyy/texmf-var") { push @changedtmf, "TEXMFVAR = $vars{'TEXMFVAR'}\n"; - $rewritetmflua = 1; # TEXMFVAR change -> new texmfcnf.lua } } elsif ($line =~ m/^TEXMFCONFIG/) { if ("$vars{'TEXMFCONFIG'}" ne "~/.texlive$yyyy/texmf-config") { @@ -1018,21 +1016,42 @@ EOF } close(TMF) || warn "close($TMF) failed: $!"; - if ($rewritetmflua) { - $TMFLUA = ">$vars{'TEXDIR'}/texmfcnf.lua"; - open(TMFLUA, $TMFLUA) || die "open($TMFLUA) failed: $!"; - + $TMFLUA = ">$vars{'TEXDIR'}/texmfcnf.lua"; + open(TMFLUA, $TMFLUA) || die "open($TMFLUA) failed: $!"; print TMFLUA <