summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPiotr Strzelczyk <piotr@eps.gda.pl>2014-04-30 16:03:08 +0000
committerPiotr Strzelczyk <piotr@eps.gda.pl>2014-04-30 16:03:08 +0000
commit402f016e9c8bdc8d65d50f0153d2c65f55ffd3b9 (patch)
tree80960200ec2ce67103097fd43e1de39172552509
parent0009ef1071afe41f1110b2e000b1a3de0564697b (diff)
fix for argument duplication in fmtutil
git-svn-id: svn://tug.org/texlive/trunk@33766 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xBuild/source/texk/texlive/w32_wrapper/runscript.tlu6
-rwxr-xr-xMaster/bin/win32/runscript.tlu4
2 files changed, 7 insertions, 3 deletions
diff --git a/Build/source/texk/texlive/w32_wrapper/runscript.tlu b/Build/source/texk/texlive/w32_wrapper/runscript.tlu
index 8dfeaaf75de..2b8a2804f4f 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: 31764 $", "%d+") or "0"
-local svndate = string.match("$Date: 2013-09-26 01:02:54 +0200 (Thu, 26 Sep 2013) $", "[-%d]+") or "2009-12-04"
+local svndate = string.match("$Date: 2013-09-26 00:02:54 +0100 (Thu, 26 Sep 2013) $", "[-%d]+") or "2009-12-04"
local bannerstr = "runscript wrapper utility (rev. " ..
svnrevision .. ", " .. svndate .. ")\n" ..
"usage: runscript script-name [arguments]\n" ..
@@ -244,6 +244,8 @@ local docstr = [[
saving settings. Patch by Yusuke KUROKI
2013/09/22
- add TEXMFDIST/fonts to the GS_LIB path. Patch by Yusuke KUROKI
+ 2014/04/30
+ - fix for argument duplication in fmtutil
]]
-- HELPER SUBROUTINES --
@@ -592,7 +594,7 @@ elseif progname == 'dviout' then
table.concat(texrt, ';') .. [['" "-gsx=']] .. GSEXE .. [['"]];
ARGV = {[0]=TEXDIR..'/tlpkg/dviout/dviout.exe', 'dviout', par}
elseif progname == 'fmtutil' and sysprog then
- ARGV = {[0]=BINDIR..'/fmtutil.exe', 'fmtutil', argline}
+ ARGV = {[0]=BINDIR..'/fmtutil.exe', 'fmtutil'}
elseif progname == 'mkluatexfontdb' then
progname = 'luaotfload-tool'
table.insert(arg, '--alias=mkluatexfontdb')
diff --git a/Master/bin/win32/runscript.tlu b/Master/bin/win32/runscript.tlu
index a722f016070..3ccfb8a50be 100755
--- a/Master/bin/win32/runscript.tlu
+++ b/Master/bin/win32/runscript.tlu
@@ -244,6 +244,8 @@ local docstr = [[
saving settings. Patch by Yusuke KUROKI
2013/09/22
- add TEXMFDIST/fonts to the GS_LIB path. Patch by Yusuke KUROKI
+ 2014/04/30
+ - fix for argument duplication in fmtutil
]]
-- HELPER SUBROUTINES --
@@ -592,7 +594,7 @@ elseif progname == 'dviout' then
table.concat(texrt, ';') .. [['" "-gsx=']] .. GSEXE .. [['"]];
ARGV = {[0]=TEXDIR..'/tlpkg/dviout/dviout.exe', 'dviout', par}
elseif progname == 'fmtutil' and sysprog then
- ARGV = {[0]=BINDIR..'/fmtutil.exe', 'fmtutil', argline}
+ ARGV = {[0]=BINDIR..'/fmtutil.exe', 'fmtutil'}
elseif progname == 'mkluatexfontdb' then
progname = 'luaotfload-tool'
table.insert(arg, '--alias=mkluatexfontdb')