diff options
| author | Reinhard Kotucha <reinhard.kotucha@web.de> | 2017-04-23 22:15:25 +0000 |
|---|---|---|
| committer | Reinhard Kotucha <reinhard.kotucha@web.de> | 2017-04-23 22:15:25 +0000 |
| commit | 54448d6ab44d2033482fafa56ddc40d42a6815eb (patch) | |
| tree | d4fdfff7b7f75c367a76f872e2986af75c5f81a3 /Build | |
| parent | f2a947f3017b82f1dfa1058d1d720fe11d298e92 (diff) | |
Add files needed for CJK to tlgs, adapt runscript.tlu accordingly.
git-svn-id: svn://tug.org/texlive/trunk@43997 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
| -rwxr-xr-x | Build/source/texk/texlive/w32_wrapper/runscript.tlu | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/Build/source/texk/texlive/w32_wrapper/runscript.tlu b/Build/source/texk/texlive/w32_wrapper/runscript.tlu index bd67db241c7..aac565fa153 100755 --- a/Build/source/texk/texlive/w32_wrapper/runscript.tlu +++ b/Build/source/texk/texlive/w32_wrapper/runscript.tlu @@ -1,7 +1,7 @@ -local svnrevision = string.match("$Revision: 40700 $", "%d+") or "0" -local svndate = string.match("$Date: 2016-04-23 14:35:18 +0200 (Sat, 23 Apr 2016) $", "[-%d]+") or "2009-12-04" +local svnrevision = string.match("$Revision: 43968 $", "%d+") or "0" +local svndate = string.match("$Date: 2017-04-22 01:24:18 +0200 (Sat, 22 Apr 2017) $", "[-%d]+") or "2009-12-04" local bannerstr = "runscript wrapper utility (rev. " .. svnrevision .. ", " .. svndate .. ")\n" .. "usage: runscript script-name [arguments]\n" .. @@ -255,6 +255,8 @@ local docstr = [[ - fix spurious arguments for updmap and fmtutil 2016/04/22 - Warning if external perl is requested but missing + 2017/04/22 (exactly one year later ;-) + - Cater for fmtutil-user and updmap-user => -user arg ]] -- HELPER SUBROUTINES -- @@ -437,6 +439,10 @@ end -- special case of sys programs progname, substcount = string.gsub(progname, '%-sys$', '') local sysprog = (substcount > 0) -- true if there was a -sys suffix removed +-- special case of user programs +-- we do not guard against programs foobar-user-sys ... we don't ship them +progname, substcount = string.gsub(progname, '%-user$', '') +local userprog = (substcount > 0) -- true if there was a -user suffix removed -- prevent recursive calls to this script assert(progname ~= 'runscript', "oops! wrapping the wrapper?") @@ -530,8 +536,12 @@ if GSEXE then end else -- use built in gs - os.setenv('GS_LIB', TEXDIR..'/tlpkg/tlgs/lib;'..TEXDIR..'/tlpkg/tlgs/fonts;' - ..os.getenv('WINDIR')..'/Fonts;'..TEXMFDIST..'/fonts') + os.setenv('GS_LIB', TEXDIR..'/tlpkg/tlgs/lib;' + ..TEXDIR..'/tlpkg/tlgs/fonts;' + ..TEXDIR..'/tlpkg/tlgs/Resource/Init;' + ..TEXDIR..'/tlpkg/tlgs/Resource;' + ..TEXDIR..'/tlpkg/tlgs/kanji;' + ..os.getenv('WINDIR')..'/Fonts;'..TEXMFDIST..'/fonts') os.setenv('GS_DLL', TEXDIR..'/tlpkg/tlgs/bin/gsdll32.dll') GSEXE = TEXDIR..'/tlpkg/tlgs/bin/gswin32c.exe' GSNAME = 'gswin32c.exe' @@ -589,10 +599,14 @@ elseif progname == 'a2ping' then elseif progname == 'updmap' then if sysprog then argline = ' --sys ' .. argline + elseif userprog then + argline = ' --user ' .. argline end elseif progname == 'fmtutil' then if sysprog then argline = ' --sys ' .. argline + elseif userprog then + argline = ' --user ' .. argline end elseif progname == 'asy' then os.setenv('ASYMPTOTE_GS', GSEXE) |