summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorTaco Hoekwater <taco@elvenkind.com>2011-06-06 11:20:16 +0000
committerTaco Hoekwater <taco@elvenkind.com>2011-06-06 11:20:16 +0000
commit857ffc408ecbcbebfd4ace2a444e618e324a4d61 (patch)
tree5b8acdaaec9aec68bdf8f4c49d474edae6452c52 /Master
parente667c797cbec2ada963b25777d871e1ddcaa546e (diff)
A fix for filepaths with spaces in context mkii (possibly partial)
git-svn-id: svn://tug.org/texlive/trunk@22820 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rwxr-xr-xMaster/bin/alpha-linux/mtxrun6
-rwxr-xr-xMaster/bin/amd64-freebsd/mtxrun6
-rwxr-xr-xMaster/bin/amd64-kfreebsd/mtxrun6
-rwxr-xr-xMaster/bin/i386-cygwin/mtxrun6
-rwxr-xr-xMaster/bin/i386-freebsd/mtxrun6
-rwxr-xr-xMaster/bin/i386-kfreebsd/mtxrun6
-rwxr-xr-xMaster/bin/i386-linux/mtxrun6
-rwxr-xr-xMaster/bin/i386-netbsd/mtxrun6
-rwxr-xr-xMaster/bin/i386-solaris/mtxrun6
-rwxr-xr-xMaster/bin/mips-irix/mtxrun6
-rwxr-xr-xMaster/bin/powerpc-aix/mtxrun6
-rwxr-xr-xMaster/bin/powerpc-linux/mtxrun6
-rwxr-xr-xMaster/bin/sparc-linux/mtxrun6
-rwxr-xr-xMaster/bin/sparc-solaris/mtxrun6
-rwxr-xr-xMaster/bin/universal-darwin/mtxrun6
-rwxr-xr-xMaster/bin/win32/mtxrun.lua6
-rwxr-xr-xMaster/bin/x86_64-darwin/mtxrun6
-rwxr-xr-xMaster/bin/x86_64-linux/mtxrun6
-rwxr-xr-xMaster/bin/x86_64-solaris/mtxrun6
-rwxr-xr-xMaster/texmf-dist/scripts/context/lua/mtxrun.lua6
-rwxr-xr-xMaster/texmf-dist/scripts/context/stubs/mswin/mtxrun.lua6
-rwxr-xr-xMaster/texmf-dist/scripts/context/stubs/unix/mtxrun6
22 files changed, 88 insertions, 44 deletions
diff --git a/Master/bin/alpha-linux/mtxrun b/Master/bin/alpha-linux/mtxrun
index 5ca97db588e..f0b07dddd4b 100755
--- a/Master/bin/alpha-linux/mtxrun
+++ b/Master/bin/alpha-linux/mtxrun
@@ -14532,11 +14532,13 @@ function runners.execute_script(fullname,internal,nosplit)
environment.ownscript = result
dofile(result)
else
+ local quotedresult = result
+ if string.match(result,' ') and not string.match(result,"^\".*\"$") then quotedresult = '"' .. result .. '"' end
local binary = runners.applications[file.extname(result)]
if binary and binary ~= "" then
- result = binary .. " " .. result
+ quotedresult = binary .. " " .. quotedresult
end
- local command = result .. " " .. environment.reconstructcommandline(environment.arguments_after,noquote)
+ local command = quotedresult .. " " .. environment.reconstructcommandline(environment.arguments_after,noquote)
if e_verbose then
report()
report("executing: %s",command)
diff --git a/Master/bin/amd64-freebsd/mtxrun b/Master/bin/amd64-freebsd/mtxrun
index 5ca97db588e..f0b07dddd4b 100755
--- a/Master/bin/amd64-freebsd/mtxrun
+++ b/Master/bin/amd64-freebsd/mtxrun
@@ -14532,11 +14532,13 @@ function runners.execute_script(fullname,internal,nosplit)
environment.ownscript = result
dofile(result)
else
+ local quotedresult = result
+ if string.match(result,' ') and not string.match(result,"^\".*\"$") then quotedresult = '"' .. result .. '"' end
local binary = runners.applications[file.extname(result)]
if binary and binary ~= "" then
- result = binary .. " " .. result
+ quotedresult = binary .. " " .. quotedresult
end
- local command = result .. " " .. environment.reconstructcommandline(environment.arguments_after,noquote)
+ local command = quotedresult .. " " .. environment.reconstructcommandline(environment.arguments_after,noquote)
if e_verbose then
report()
report("executing: %s",command)
diff --git a/Master/bin/amd64-kfreebsd/mtxrun b/Master/bin/amd64-kfreebsd/mtxrun
index 5ca97db588e..f0b07dddd4b 100755
--- a/Master/bin/amd64-kfreebsd/mtxrun
+++ b/Master/bin/amd64-kfreebsd/mtxrun
@@ -14532,11 +14532,13 @@ function runners.execute_script(fullname,internal,nosplit)
environment.ownscript = result
dofile(result)
else
+ local quotedresult = result
+ if string.match(result,' ') and not string.match(result,"^\".*\"$") then quotedresult = '"' .. result .. '"' end
local binary = runners.applications[file.extname(result)]
if binary and binary ~= "" then
- result = binary .. " " .. result
+ quotedresult = binary .. " " .. quotedresult
end
- local command = result .. " " .. environment.reconstructcommandline(environment.arguments_after,noquote)
+ local command = quotedresult .. " " .. environment.reconstructcommandline(environment.arguments_after,noquote)
if e_verbose then
report()
report("executing: %s",command)
diff --git a/Master/bin/i386-cygwin/mtxrun b/Master/bin/i386-cygwin/mtxrun
index 5ca97db588e..f0b07dddd4b 100755
--- a/Master/bin/i386-cygwin/mtxrun
+++ b/Master/bin/i386-cygwin/mtxrun
@@ -14532,11 +14532,13 @@ function runners.execute_script(fullname,internal,nosplit)
environment.ownscript = result
dofile(result)
else
+ local quotedresult = result
+ if string.match(result,' ') and not string.match(result,"^\".*\"$") then quotedresult = '"' .. result .. '"' end
local binary = runners.applications[file.extname(result)]
if binary and binary ~= "" then
- result = binary .. " " .. result
+ quotedresult = binary .. " " .. quotedresult
end
- local command = result .. " " .. environment.reconstructcommandline(environment.arguments_after,noquote)
+ local command = quotedresult .. " " .. environment.reconstructcommandline(environment.arguments_after,noquote)
if e_verbose then
report()
report("executing: %s",command)
diff --git a/Master/bin/i386-freebsd/mtxrun b/Master/bin/i386-freebsd/mtxrun
index 5ca97db588e..f0b07dddd4b 100755
--- a/Master/bin/i386-freebsd/mtxrun
+++ b/Master/bin/i386-freebsd/mtxrun
@@ -14532,11 +14532,13 @@ function runners.execute_script(fullname,internal,nosplit)
environment.ownscript = result
dofile(result)
else
+ local quotedresult = result
+ if string.match(result,' ') and not string.match(result,"^\".*\"$") then quotedresult = '"' .. result .. '"' end
local binary = runners.applications[file.extname(result)]
if binary and binary ~= "" then
- result = binary .. " " .. result
+ quotedresult = binary .. " " .. quotedresult
end
- local command = result .. " " .. environment.reconstructcommandline(environment.arguments_after,noquote)
+ local command = quotedresult .. " " .. environment.reconstructcommandline(environment.arguments_after,noquote)
if e_verbose then
report()
report("executing: %s",command)
diff --git a/Master/bin/i386-kfreebsd/mtxrun b/Master/bin/i386-kfreebsd/mtxrun
index 5ca97db588e..f0b07dddd4b 100755
--- a/Master/bin/i386-kfreebsd/mtxrun
+++ b/Master/bin/i386-kfreebsd/mtxrun
@@ -14532,11 +14532,13 @@ function runners.execute_script(fullname,internal,nosplit)
environment.ownscript = result
dofile(result)
else
+ local quotedresult = result
+ if string.match(result,' ') and not string.match(result,"^\".*\"$") then quotedresult = '"' .. result .. '"' end
local binary = runners.applications[file.extname(result)]
if binary and binary ~= "" then
- result = binary .. " " .. result
+ quotedresult = binary .. " " .. quotedresult
end
- local command = result .. " " .. environment.reconstructcommandline(environment.arguments_after,noquote)
+ local command = quotedresult .. " " .. environment.reconstructcommandline(environment.arguments_after,noquote)
if e_verbose then
report()
report("executing: %s",command)
diff --git a/Master/bin/i386-linux/mtxrun b/Master/bin/i386-linux/mtxrun
index 5ca97db588e..f0b07dddd4b 100755
--- a/Master/bin/i386-linux/mtxrun
+++ b/Master/bin/i386-linux/mtxrun
@@ -14532,11 +14532,13 @@ function runners.execute_script(fullname,internal,nosplit)
environment.ownscript = result
dofile(result)
else
+ local quotedresult = result
+ if string.match(result,' ') and not string.match(result,"^\".*\"$") then quotedresult = '"' .. result .. '"' end
local binary = runners.applications[file.extname(result)]
if binary and binary ~= "" then
- result = binary .. " " .. result
+ quotedresult = binary .. " " .. quotedresult
end
- local command = result .. " " .. environment.reconstructcommandline(environment.arguments_after,noquote)
+ local command = quotedresult .. " " .. environment.reconstructcommandline(environment.arguments_after,noquote)
if e_verbose then
report()
report("executing: %s",command)
diff --git a/Master/bin/i386-netbsd/mtxrun b/Master/bin/i386-netbsd/mtxrun
index 5ca97db588e..f0b07dddd4b 100755
--- a/Master/bin/i386-netbsd/mtxrun
+++ b/Master/bin/i386-netbsd/mtxrun
@@ -14532,11 +14532,13 @@ function runners.execute_script(fullname,internal,nosplit)
environment.ownscript = result
dofile(result)
else
+ local quotedresult = result
+ if string.match(result,' ') and not string.match(result,"^\".*\"$") then quotedresult = '"' .. result .. '"' end
local binary = runners.applications[file.extname(result)]
if binary and binary ~= "" then
- result = binary .. " " .. result
+ quotedresult = binary .. " " .. quotedresult
end
- local command = result .. " " .. environment.reconstructcommandline(environment.arguments_after,noquote)
+ local command = quotedresult .. " " .. environment.reconstructcommandline(environment.arguments_after,noquote)
if e_verbose then
report()
report("executing: %s",command)
diff --git a/Master/bin/i386-solaris/mtxrun b/Master/bin/i386-solaris/mtxrun
index 5ca97db588e..f0b07dddd4b 100755
--- a/Master/bin/i386-solaris/mtxrun
+++ b/Master/bin/i386-solaris/mtxrun
@@ -14532,11 +14532,13 @@ function runners.execute_script(fullname,internal,nosplit)
environment.ownscript = result
dofile(result)
else
+ local quotedresult = result
+ if string.match(result,' ') and not string.match(result,"^\".*\"$") then quotedresult = '"' .. result .. '"' end
local binary = runners.applications[file.extname(result)]
if binary and binary ~= "" then
- result = binary .. " " .. result
+ quotedresult = binary .. " " .. quotedresult
end
- local command = result .. " " .. environment.reconstructcommandline(environment.arguments_after,noquote)
+ local command = quotedresult .. " " .. environment.reconstructcommandline(environment.arguments_after,noquote)
if e_verbose then
report()
report("executing: %s",command)
diff --git a/Master/bin/mips-irix/mtxrun b/Master/bin/mips-irix/mtxrun
index 5ca97db588e..f0b07dddd4b 100755
--- a/Master/bin/mips-irix/mtxrun
+++ b/Master/bin/mips-irix/mtxrun
@@ -14532,11 +14532,13 @@ function runners.execute_script(fullname,internal,nosplit)
environment.ownscript = result
dofile(result)
else
+ local quotedresult = result
+ if string.match(result,' ') and not string.match(result,"^\".*\"$") then quotedresult = '"' .. result .. '"' end
local binary = runners.applications[file.extname(result)]
if binary and binary ~= "" then
- result = binary .. " " .. result
+ quotedresult = binary .. " " .. quotedresult
end
- local command = result .. " " .. environment.reconstructcommandline(environment.arguments_after,noquote)
+ local command = quotedresult .. " " .. environment.reconstructcommandline(environment.arguments_after,noquote)
if e_verbose then
report()
report("executing: %s",command)
diff --git a/Master/bin/powerpc-aix/mtxrun b/Master/bin/powerpc-aix/mtxrun
index 5ca97db588e..f0b07dddd4b 100755
--- a/Master/bin/powerpc-aix/mtxrun
+++ b/Master/bin/powerpc-aix/mtxrun
@@ -14532,11 +14532,13 @@ function runners.execute_script(fullname,internal,nosplit)
environment.ownscript = result
dofile(result)
else
+ local quotedresult = result
+ if string.match(result,' ') and not string.match(result,"^\".*\"$") then quotedresult = '"' .. result .. '"' end
local binary = runners.applications[file.extname(result)]
if binary and binary ~= "" then
- result = binary .. " " .. result
+ quotedresult = binary .. " " .. quotedresult
end
- local command = result .. " " .. environment.reconstructcommandline(environment.arguments_after,noquote)
+ local command = quotedresult .. " " .. environment.reconstructcommandline(environment.arguments_after,noquote)
if e_verbose then
report()
report("executing: %s",command)
diff --git a/Master/bin/powerpc-linux/mtxrun b/Master/bin/powerpc-linux/mtxrun
index 5ca97db588e..f0b07dddd4b 100755
--- a/Master/bin/powerpc-linux/mtxrun
+++ b/Master/bin/powerpc-linux/mtxrun
@@ -14532,11 +14532,13 @@ function runners.execute_script(fullname,internal,nosplit)
environment.ownscript = result
dofile(result)
else
+ local quotedresult = result
+ if string.match(result,' ') and not string.match(result,"^\".*\"$") then quotedresult = '"' .. result .. '"' end
local binary = runners.applications[file.extname(result)]
if binary and binary ~= "" then
- result = binary .. " " .. result
+ quotedresult = binary .. " " .. quotedresult
end
- local command = result .. " " .. environment.reconstructcommandline(environment.arguments_after,noquote)
+ local command = quotedresult .. " " .. environment.reconstructcommandline(environment.arguments_after,noquote)
if e_verbose then
report()
report("executing: %s",command)
diff --git a/Master/bin/sparc-linux/mtxrun b/Master/bin/sparc-linux/mtxrun
index 5ca97db588e..f0b07dddd4b 100755
--- a/Master/bin/sparc-linux/mtxrun
+++ b/Master/bin/sparc-linux/mtxrun
@@ -14532,11 +14532,13 @@ function runners.execute_script(fullname,internal,nosplit)
environment.ownscript = result
dofile(result)
else
+ local quotedresult = result
+ if string.match(result,' ') and not string.match(result,"^\".*\"$") then quotedresult = '"' .. result .. '"' end
local binary = runners.applications[file.extname(result)]
if binary and binary ~= "" then
- result = binary .. " " .. result
+ quotedresult = binary .. " " .. quotedresult
end
- local command = result .. " " .. environment.reconstructcommandline(environment.arguments_after,noquote)
+ local command = quotedresult .. " " .. environment.reconstructcommandline(environment.arguments_after,noquote)
if e_verbose then
report()
report("executing: %s",command)
diff --git a/Master/bin/sparc-solaris/mtxrun b/Master/bin/sparc-solaris/mtxrun
index 5ca97db588e..f0b07dddd4b 100755
--- a/Master/bin/sparc-solaris/mtxrun
+++ b/Master/bin/sparc-solaris/mtxrun
@@ -14532,11 +14532,13 @@ function runners.execute_script(fullname,internal,nosplit)
environment.ownscript = result
dofile(result)
else
+ local quotedresult = result
+ if string.match(result,' ') and not string.match(result,"^\".*\"$") then quotedresult = '"' .. result .. '"' end
local binary = runners.applications[file.extname(result)]
if binary and binary ~= "" then
- result = binary .. " " .. result
+ quotedresult = binary .. " " .. quotedresult
end
- local command = result .. " " .. environment.reconstructcommandline(environment.arguments_after,noquote)
+ local command = quotedresult .. " " .. environment.reconstructcommandline(environment.arguments_after,noquote)
if e_verbose then
report()
report("executing: %s",command)
diff --git a/Master/bin/universal-darwin/mtxrun b/Master/bin/universal-darwin/mtxrun
index 5ca97db588e..f0b07dddd4b 100755
--- a/Master/bin/universal-darwin/mtxrun
+++ b/Master/bin/universal-darwin/mtxrun
@@ -14532,11 +14532,13 @@ function runners.execute_script(fullname,internal,nosplit)
environment.ownscript = result
dofile(result)
else
+ local quotedresult = result
+ if string.match(result,' ') and not string.match(result,"^\".*\"$") then quotedresult = '"' .. result .. '"' end
local binary = runners.applications[file.extname(result)]
if binary and binary ~= "" then
- result = binary .. " " .. result
+ quotedresult = binary .. " " .. quotedresult
end
- local command = result .. " " .. environment.reconstructcommandline(environment.arguments_after,noquote)
+ local command = quotedresult .. " " .. environment.reconstructcommandline(environment.arguments_after,noquote)
if e_verbose then
report()
report("executing: %s",command)
diff --git a/Master/bin/win32/mtxrun.lua b/Master/bin/win32/mtxrun.lua
index 5ca97db588e..f0b07dddd4b 100755
--- a/Master/bin/win32/mtxrun.lua
+++ b/Master/bin/win32/mtxrun.lua
@@ -14532,11 +14532,13 @@ function runners.execute_script(fullname,internal,nosplit)
environment.ownscript = result
dofile(result)
else
+ local quotedresult = result
+ if string.match(result,' ') and not string.match(result,"^\".*\"$") then quotedresult = '"' .. result .. '"' end
local binary = runners.applications[file.extname(result)]
if binary and binary ~= "" then
- result = binary .. " " .. result
+ quotedresult = binary .. " " .. quotedresult
end
- local command = result .. " " .. environment.reconstructcommandline(environment.arguments_after,noquote)
+ local command = quotedresult .. " " .. environment.reconstructcommandline(environment.arguments_after,noquote)
if e_verbose then
report()
report("executing: %s",command)
diff --git a/Master/bin/x86_64-darwin/mtxrun b/Master/bin/x86_64-darwin/mtxrun
index 5ca97db588e..f0b07dddd4b 100755
--- a/Master/bin/x86_64-darwin/mtxrun
+++ b/Master/bin/x86_64-darwin/mtxrun
@@ -14532,11 +14532,13 @@ function runners.execute_script(fullname,internal,nosplit)
environment.ownscript = result
dofile(result)
else
+ local quotedresult = result
+ if string.match(result,' ') and not string.match(result,"^\".*\"$") then quotedresult = '"' .. result .. '"' end
local binary = runners.applications[file.extname(result)]
if binary and binary ~= "" then
- result = binary .. " " .. result
+ quotedresult = binary .. " " .. quotedresult
end
- local command = result .. " " .. environment.reconstructcommandline(environment.arguments_after,noquote)
+ local command = quotedresult .. " " .. environment.reconstructcommandline(environment.arguments_after,noquote)
if e_verbose then
report()
report("executing: %s",command)
diff --git a/Master/bin/x86_64-linux/mtxrun b/Master/bin/x86_64-linux/mtxrun
index 5ca97db588e..f0b07dddd4b 100755
--- a/Master/bin/x86_64-linux/mtxrun
+++ b/Master/bin/x86_64-linux/mtxrun
@@ -14532,11 +14532,13 @@ function runners.execute_script(fullname,internal,nosplit)
environment.ownscript = result
dofile(result)
else
+ local quotedresult = result
+ if string.match(result,' ') and not string.match(result,"^\".*\"$") then quotedresult = '"' .. result .. '"' end
local binary = runners.applications[file.extname(result)]
if binary and binary ~= "" then
- result = binary .. " " .. result
+ quotedresult = binary .. " " .. quotedresult
end
- local command = result .. " " .. environment.reconstructcommandline(environment.arguments_after,noquote)
+ local command = quotedresult .. " " .. environment.reconstructcommandline(environment.arguments_after,noquote)
if e_verbose then
report()
report("executing: %s",command)
diff --git a/Master/bin/x86_64-solaris/mtxrun b/Master/bin/x86_64-solaris/mtxrun
index 5ca97db588e..f0b07dddd4b 100755
--- a/Master/bin/x86_64-solaris/mtxrun
+++ b/Master/bin/x86_64-solaris/mtxrun
@@ -14532,11 +14532,13 @@ function runners.execute_script(fullname,internal,nosplit)
environment.ownscript = result
dofile(result)
else
+ local quotedresult = result
+ if string.match(result,' ') and not string.match(result,"^\".*\"$") then quotedresult = '"' .. result .. '"' end
local binary = runners.applications[file.extname(result)]
if binary and binary ~= "" then
- result = binary .. " " .. result
+ quotedresult = binary .. " " .. quotedresult
end
- local command = result .. " " .. environment.reconstructcommandline(environment.arguments_after,noquote)
+ local command = quotedresult .. " " .. environment.reconstructcommandline(environment.arguments_after,noquote)
if e_verbose then
report()
report("executing: %s",command)
diff --git a/Master/texmf-dist/scripts/context/lua/mtxrun.lua b/Master/texmf-dist/scripts/context/lua/mtxrun.lua
index 5ca97db588e..f0b07dddd4b 100755
--- a/Master/texmf-dist/scripts/context/lua/mtxrun.lua
+++ b/Master/texmf-dist/scripts/context/lua/mtxrun.lua
@@ -14532,11 +14532,13 @@ function runners.execute_script(fullname,internal,nosplit)
environment.ownscript = result
dofile(result)
else
+ local quotedresult = result
+ if string.match(result,' ') and not string.match(result,"^\".*\"$") then quotedresult = '"' .. result .. '"' end
local binary = runners.applications[file.extname(result)]
if binary and binary ~= "" then
- result = binary .. " " .. result
+ quotedresult = binary .. " " .. quotedresult
end
- local command = result .. " " .. environment.reconstructcommandline(environment.arguments_after,noquote)
+ local command = quotedresult .. " " .. environment.reconstructcommandline(environment.arguments_after,noquote)
if e_verbose then
report()
report("executing: %s",command)
diff --git a/Master/texmf-dist/scripts/context/stubs/mswin/mtxrun.lua b/Master/texmf-dist/scripts/context/stubs/mswin/mtxrun.lua
index 5ca97db588e..f0b07dddd4b 100755
--- a/Master/texmf-dist/scripts/context/stubs/mswin/mtxrun.lua
+++ b/Master/texmf-dist/scripts/context/stubs/mswin/mtxrun.lua
@@ -14532,11 +14532,13 @@ function runners.execute_script(fullname,internal,nosplit)
environment.ownscript = result
dofile(result)
else
+ local quotedresult = result
+ if string.match(result,' ') and not string.match(result,"^\".*\"$") then quotedresult = '"' .. result .. '"' end
local binary = runners.applications[file.extname(result)]
if binary and binary ~= "" then
- result = binary .. " " .. result
+ quotedresult = binary .. " " .. quotedresult
end
- local command = result .. " " .. environment.reconstructcommandline(environment.arguments_after,noquote)
+ local command = quotedresult .. " " .. environment.reconstructcommandline(environment.arguments_after,noquote)
if e_verbose then
report()
report("executing: %s",command)
diff --git a/Master/texmf-dist/scripts/context/stubs/unix/mtxrun b/Master/texmf-dist/scripts/context/stubs/unix/mtxrun
index 5ca97db588e..f0b07dddd4b 100755
--- a/Master/texmf-dist/scripts/context/stubs/unix/mtxrun
+++ b/Master/texmf-dist/scripts/context/stubs/unix/mtxrun
@@ -14532,11 +14532,13 @@ function runners.execute_script(fullname,internal,nosplit)
environment.ownscript = result
dofile(result)
else
+ local quotedresult = result
+ if string.match(result,' ') and not string.match(result,"^\".*\"$") then quotedresult = '"' .. result .. '"' end
local binary = runners.applications[file.extname(result)]
if binary and binary ~= "" then
- result = binary .. " " .. result
+ quotedresult = binary .. " " .. quotedresult
end
- local command = result .. " " .. environment.reconstructcommandline(environment.arguments_after,noquote)
+ local command = quotedresult .. " " .. environment.reconstructcommandline(environment.arguments_after,noquote)
if e_verbose then
report()
report("executing: %s",command)