summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPiotr Strzelczyk <piotr@eps.gda.pl>2009-12-15 01:16:12 +0000
committerPiotr Strzelczyk <piotr@eps.gda.pl>2009-12-15 01:16:12 +0000
commit79a45c2d99b673a3cdb3e4b473cbee3dbf6723af (patch)
treec0cdab856c50523d503b438eeb8cf7f22ff1b197
parentc783e443b4348e247772e1021f704bb27865425c (diff)
one more fix for wrapper
git-svn-id: svn://tug.org/texlive/trunk@16411 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/texlive/w32_wrapper/runscript.tlu7
-rw-r--r--Master/bin/win32/runscript.tlu7
2 files changed, 6 insertions, 8 deletions
diff --git a/Build/source/texk/texlive/w32_wrapper/runscript.tlu b/Build/source/texk/texlive/w32_wrapper/runscript.tlu
index 534c0babc7b..785e5e742aa 100644
--- a/Build/source/texk/texlive/w32_wrapper/runscript.tlu
+++ b/Build/source/texk/texlive/w32_wrapper/runscript.tlu
@@ -94,7 +94,7 @@ end
-- searches the PATH variable for a file
local function search_path(fname, PATH, PATHEXT)
if string.find(fname, '[/\\]') then
- return nil, "not searching absolute or relative path: "..fname
+ return nil, "directory part not allowed for PATH search: "..fname
end
PATH = PATH or os.getenv('PATH')
PATHEXT = PATHEXT or '\0'
@@ -105,7 +105,7 @@ local function search_path(fname, PATH, PATHEXT)
if lfs.isfile(f) then return f, ext end
end
end
- return nil, "file not found: "..fname
+ return nil, "file not on PATH: "..fname
end
-- locates texmfscript to execute
@@ -298,8 +298,7 @@ else -- general case (no alias)
arg[0] = progfullname
program = progfullname
else
- program = (ext ~= '') and extension_map[ext] or
- assert(shebang_to_argv(progfullname))
+ program = extension_map[ext] or assert(shebang_to_argv(progfullname))
table.insert(program, _q(progfullname))
table.insert(program, argline)
program[0] = program[0] or assert(check_command(program[1], PATH))
diff --git a/Master/bin/win32/runscript.tlu b/Master/bin/win32/runscript.tlu
index 534c0babc7b..785e5e742aa 100644
--- a/Master/bin/win32/runscript.tlu
+++ b/Master/bin/win32/runscript.tlu
@@ -94,7 +94,7 @@ end
-- searches the PATH variable for a file
local function search_path(fname, PATH, PATHEXT)
if string.find(fname, '[/\\]') then
- return nil, "not searching absolute or relative path: "..fname
+ return nil, "directory part not allowed for PATH search: "..fname
end
PATH = PATH or os.getenv('PATH')
PATHEXT = PATHEXT or '\0'
@@ -105,7 +105,7 @@ local function search_path(fname, PATH, PATHEXT)
if lfs.isfile(f) then return f, ext end
end
end
- return nil, "file not found: "..fname
+ return nil, "file not on PATH: "..fname
end
-- locates texmfscript to execute
@@ -298,8 +298,7 @@ else -- general case (no alias)
arg[0] = progfullname
program = progfullname
else
- program = (ext ~= '') and extension_map[ext] or
- assert(shebang_to_argv(progfullname))
+ program = extension_map[ext] or assert(shebang_to_argv(progfullname))
table.insert(program, _q(progfullname))
table.insert(program, argline)
program[0] = program[0] or assert(check_command(program[1], PATH))