diff options
-rwxr-xr-x | Master/install-tl | 22 | ||||
-rwxr-xr-x | Master/tlpkg/bin/tl-update-tlnet | 1 |
2 files changed, 19 insertions, 4 deletions
diff --git a/Master/install-tl b/Master/install-tl index a565ac661a6..d69c7a1b02e 100755 --- a/Master/install-tl +++ b/Master/install-tl @@ -812,10 +812,24 @@ operations might be disturbed.\n\n"; # we only call luatools --generate once at installation time, the # rest must be managed by the user, Taco email 2010-05-26 if (defined($install{"context"} && $install{"context"} == 1)) { - info("Generating the initial ConTeXt MkIV cache, be patient ..."); - mkdirhier($TEXMFVAR); - log(`luatools --generate`); - info("done\n"); + info("Generating luatex config file texmfcnf.lua"); + # + # can we move that to a different place? + if (!open(TMFCL,">$vars{'TEXDIR'}/texmfcnf.lua")) { + tlwarn("Cannot generate texmfcnf.lua in + $vars{'TEXDIR'}/texmfcnf.lua +not setting up luatex cache.\n"); + } else { + print TMFCL " +return { + TEXMFCACHE = '~/.texlive2010/texmf-var' +} +"; + info("Generating the initial ConTeXt MkIV cache, be patient ..."); + mkdirhier($TEXMFVAR); + log(`luatools --generate 2>&1 `); + info("done\n"); + } } # all formats option diff --git a/Master/tlpkg/bin/tl-update-tlnet b/Master/tlpkg/bin/tl-update-tlnet index d20a4764cfc..81811f43834 100755 --- a/Master/tlpkg/bin/tl-update-tlnet +++ b/Master/tlpkg/bin/tl-update-tlnet @@ -142,6 +142,7 @@ unexpected_output=`cat install.log \ | grep -Ev '^writing updmap.cfg to' \ | grep -Ev '^writing language.(dat|def|dat.lua) data to' \ | grep -Ev '^pre-generating all format file' \ + | grep -Ev '^Generating luatex config file texmfcnf' \ | grep -Ev '^Generating the initial ConTeXt MkIV cache' \ | grep -Ev '^running ' \ | grep -Ev '^done running ' \ |