From 2f44003aab284c595680e9a84b9891b2b9fabb66 Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Sat, 25 Jun 2011 11:24:00 +0200 Subject: beta 2011.06.25 11:24 --- web2c/texlive2011cnf.lua | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'web2c') diff --git a/web2c/texlive2011cnf.lua b/web2c/texlive2011cnf.lua index f11e45731..024e04205 100644 --- a/web2c/texlive2011cnf.lua +++ b/web2c/texlive2011cnf.lua @@ -1,4 +1,7 @@ -return { +local liveyear = string.match(resolvers.prefixes.selfautoparent(),"(20%d%d)") or "2011" + +--~ return { +inspect { type = "configuration", version = "1.1.1", @@ -19,17 +22,23 @@ return { -- -- TEXMFCNF = "{selfautodir:{/share,}/texmf-local/web2c,selfautoparent:{/share,}/texmf{-local,}/web2c}", - TEXMFCACHE = "selfautoparent:texmf-var;~/.texlive2011/texmf-cache", - TEXMFCONFIG = "~/.texlive2011/texmf-config", + TEXMFCACHE = string.format("selfautoparent:texmf-var;~/.texlive%s/texmf-cache",liveyear), TEXMFSYSTEM = "selfautoparent:$SELFAUTOSYSTEM", TEXMFCONTEXT = "selfautoparent:texmf-dist", + -- TEXMFLOCAL = "selfautoparent:../texmf-local"), -- should also work TEXMFLOCAL = string.gsub(resolvers.prefixes.selfautoparent(),"20%d%d$","texmf-local"), TEXMFSYSCONFIG = "selfautoparent:texmf-config", - TEXMFSYSVAR = "selfautoparent:texmf-var", + TEXMFCONFIG = string.format("home:.texlive%s/texmf-config",liveyear), + TEXMFVAR = string.format("home:.texlive%s/texmf-var",liveyear), + + -- We have only one cache path but there can be more. The first writable one + -- will be chosen but there can be more readable paths. + + TEXMFCACHE = "$TEXMFSYSVAR;$TEXMFVAR", TEXMF = "{$TEXMFCONFIG,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFPROJECT,!!$TEXMFFONTS,!!$TEXMFLOCAL,!!$TEXMFCONTEXT,!!$TEXMFSYSTEM,!!$TEXMFMAIN}", -- cgit v1.2.3