diff options
| author | Karl Berry <karl@freefriends.org> | 2010-06-01 00:32:08 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2010-06-01 00:32:08 +0000 |
| commit | 6282918cbbbe4509d36e3d456c773143bd902535 (patch) | |
| tree | 868505638ed4975b64fbd2a6eeb211381afc241b /Master/bin/i386-solaris/mtxrun | |
| parent | e3cbd42f8919eabe630d9040feb6956fb41713ef (diff) | |
mtxrun/luatools update from scripts/context/stubs
git-svn-id: svn://tug.org/texlive/trunk@18659 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/bin/i386-solaris/mtxrun')
| -rwxr-xr-x | Master/bin/i386-solaris/mtxrun | 29 |
1 files changed, 7 insertions, 22 deletions
diff --git a/Master/bin/i386-solaris/mtxrun b/Master/bin/i386-solaris/mtxrun index b99327692d7..55a597236b9 100755 --- a/Master/bin/i386-solaris/mtxrun +++ b/Master/bin/i386-solaris/mtxrun @@ -8340,28 +8340,13 @@ local function reset_hashes() end local function check_configuration() -- not yet ok, no time for debugging now - local ie, iv = instance.environment, instance.variables - local function fix(varname,default) - local proname = varname .. "." .. instance.progname or "crap" - local p, v = ie[proname], ie[varname] or iv[varname] - if not ((p and p ~= "") or (v and v ~= "")) then - iv[varname] = default -- or environment? - end - end - local name = os.name - if name == "windows" then - fix("OSFONTDIR", "c:/windows/fonts//") - elseif name == "macosx" then - fix("OSFONTDIR", "$HOME/Library/Fonts//;/Library/Fonts//;/System/Library/Fonts//") - else - -- bad luck - end - fix("LUAINPUTS" , ".;$TEXINPUTS;$TEXMFSCRIPTS") -- no progname, hm - -- this will go away some day - fix("FONTFEATURES", ".;$TEXMF/fonts/{data,fea}//;$OPENTYPEFONTS;$TTFONTS;$T1FONTS;$AFMFONTS") - fix("FONTCIDMAPS" , ".;$TEXMF/fonts/{data,cid}//;$OPENTYPEFONTS;$TTFONTS;$T1FONTS;$AFMFONTS") - -- - fix("LUATEXLIBS" , ".;$TEXMF/luatex/lua//") + if os.env["OSFONTDIR"] then + -- ok + elseif os.type == "windows" then + os.setenv("OSFONTDIR","c:/windows/fonts//") + elseif os.type == "macosx" then + os.setenv("OSFONTDIR","$HOME/Library/Fonts//;/Library/Fonts//;/System/Library/Fonts//") + end end function resolvers.bare_variable(str) -- assumes str is a string |